Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip all tests using /proc and /sys in LXC containers

Browse Source 
These tests fail in S/390 Travis CI build, so just don't run them at all
there, as we already did for a couple of tests using /proc that also
failed in other LXC-based builds.
This commit is contained in:
Vadim Zeitlin
2021-04-04 14:37:09 +02:00
parent 0a5be41f8a
commit 051fa788ad
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/file/filetest.cpp
View File

@@ -141,6 +141,11 @@ void FileTestCase::TempFile()
// Check that GetSize() works correctly for special files. // Check that GetSize() works correctly for special files.
TEST_CASE("wxFile::Special", "[file][linux][special-file]") TEST_CASE("wxFile::Special", "[file][linux][special-file]")
{ {
// LXC containers don't (always) populate /proc and /sys, so skip these
// tests there.
if ( IsRunningInLXC() )
return;
// We can't test /proc/kcore here, unlike in the similar // We can't test /proc/kcore here, unlike in the similar
// wxFileName::GetSize() test, as wxFile must be able to open it (at least // wxFileName::GetSize() test, as wxFile must be able to open it (at least
// for reading) and usually we don't have the permissions to do it. // for reading) and usually we don't have the permissions to do it.
@@ -151,9 +156,6 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]")
wxString s; wxString s;
CHECK( fileProc.ReadAll(&s) ); CHECK( fileProc.ReadAll(&s) );
// /proc files seem to be always empty in LXC containers.
if ( !IsRunningInLXC() )
CHECK( !s.empty() ); CHECK( !s.empty() );
// All files in /sys have the size of one kernel page, even if they don't // All files in /sys have the size of one kernel page, even if they don't

9
tests/textfile/textfiletest.cpp
View File

@@ -341,14 +341,15 @@ void TextFileTestCase::ReadBig()
// correspond to the real amount of data in them, works. // correspond to the real amount of data in them, works.
TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]") TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]")
{ {
// LXC containers don't (always) populate /proc and /sys, so skip these
// tests there.
if ( IsRunningInLXC() )
return;
SECTION("/proc") SECTION("/proc")
{ {
wxTextFile f; wxTextFile f;
CHECK( f.Open("/proc/cpuinfo") ); CHECK( f.Open("/proc/cpuinfo") );
// /proc files seem to be always empty in LXC containers, so skip this
// check there.
if ( !IsRunningInLXC() )
CHECK( f.GetLineCount() > 1 ); CHECK( f.GetLineCount() > 1 );
} }