From 1736c1e59183287a82ef037c25eb38813213e0f0 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Mon, 22 May 2017 19:25:29 -0400 Subject: [PATCH] selftests: move time sensitive tests into level 1 Since too may reports of false positives have been generated during RPM package builds, let's move all test sensitive tests into level 1. This means that those tests will not be run on RPM package builds, but will continue to run on Travis-CI. Signed-off-by: Cleber Rosa --- selftests/functional/test_basic.py | 12 ++++++++++++ selftests/functional/test_loader.py | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/selftests/functional/test_basic.py b/selftests/functional/test_basic.py index 6cbfedd2..c8a630b6 100644 --- a/selftests/functional/test_basic.py +++ b/selftests/functional/test_basic.py @@ -275,6 +275,9 @@ class RunnerOperationTest(unittest.TestCase): self.assertIn("Runner error occurred: Test reports unsupported", results["tests"][0]["fail_reason"]) + @unittest.skipIf(int(os.environ.get("AVOCADO_CHECK_LEVEL", 0)) < 1, + "Skipping test that take a long time to run, are " + "resource intensive or time sensitve") def test_hanged_test_with_status(self): """ Check that avocado handles hanged tests properly """ os.chdir(basedir) @@ -535,6 +538,9 @@ class RunnerOperationTest(unittest.TestCase): result.stdout) @unittest.skipIf(not READ_BINARY, "read binary not available.") + @unittest.skipIf(int(os.environ.get("AVOCADO_CHECK_LEVEL", 0)) < 1, + "Skipping test that take a long time to run, are " + "resource intensive or time sensitve") def test_read(self): os.chdir(basedir) cmd = "%s run --sysinfo=off --job-results-dir %%s %%s" % AVOCADO @@ -698,6 +704,9 @@ class RunnerSimpleTest(unittest.TestCase): self.assertEqual(result.exit_status, expected_rc, "Avocado did not return rc %d:\n%s" % (expected_rc, result)) + @unittest.skipIf(int(os.environ.get("AVOCADO_CHECK_LEVEL", 0)) < 1, + "Skipping test that take a long time to run, are " + "resource intensive or time sensitve") def test_runner_sleep_fail_sleep_timing(self): """ Sleeptest is supposed to take 1 second, let's make a sandwich of @@ -750,6 +759,9 @@ class RunnerSimpleTest(unittest.TestCase): (expected_rc, result)) @unittest.skipIf(not SLEEP_BINARY, 'sleep binary not available') + @unittest.skipIf(int(os.environ.get("AVOCADO_CHECK_LEVEL", 0)) < 1, + "Skipping test that take a long time to run, are " + "resource intensive or time sensitve") def test_kill_stopped_sleep(self): proc = aexpect.Expect("%s run 60 --job-results-dir %s " "--external-runner %s --sysinfo=off " diff --git a/selftests/functional/test_loader.py b/selftests/functional/test_loader.py index a4e99ec0..089353ed 100644 --- a/selftests/functional/test_loader.py +++ b/selftests/functional/test_loader.py @@ -180,6 +180,9 @@ class LoaderTestFunctional(unittest.TestCase): def test_pass(self): self._test('passtest.py', AVOCADO_TEST_OK, 'INSTRUMENTED') + @unittest.skipIf(int(os.environ.get("AVOCADO_CHECK_LEVEL", 0)) < 1, + "Skipping test that take a long time to run, are " + "resource intensive or time sensitve") def test_sleep_a_lot(self): """ Verifies that the test loader, at list time, does not load the Python @@ -239,6 +242,9 @@ class LoaderTestFunctional(unittest.TestCase): % (AVOCADO, self.tmpdir, mytest)) self._run_with_timeout(cmd_line, 5) + @unittest.skipIf(int(os.environ.get("AVOCADO_CHECK_LEVEL", 0)) < 1, + "Skipping test that take a long time to run, are " + "resource intensive or time sensitve") def test_simple_using_main(self): mytest = script.TemporaryScript("simple_using_main.py", AVOCADO_TEST_SIMPLE_USING_MAIN, -- GitLab