From 43934678622ed9532c72e8df209bccf8bb7a7139 Mon Sep 17 00:00:00 2001 From: Lucas Meneghel Rodrigues Date: Mon, 28 Jul 2014 17:33:47 -0300 Subject: [PATCH] selftests: Adapt all functional tests to the new testing schema Signed-off-by: Lucas Meneghel Rodrigues --- selftests/all/functional/avocado/multiplex_tests.py | 8 ++++---- selftests/all/functional/avocado/standalone_tests.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/selftests/all/functional/avocado/multiplex_tests.py b/selftests/all/functional/avocado/multiplex_tests.py index 73aed7b9..84a91ad4 100644 --- a/selftests/all/functional/avocado/multiplex_tests.py +++ b/selftests/all/functional/avocado/multiplex_tests.py @@ -60,7 +60,7 @@ class MultiplexTests(unittest.TestCase): "%d:\n%s" % (cmd_line, expected_rc, result)) def test_mplex_plugin(self): - cmd_line = './scripts/avocado multiplex tests/sleeptest/sleeptest.mplx' + cmd_line = './scripts/avocado multiplex tests/sleeptest.data/sleeptest.mplx' expected_rc = 0 self.run_and_check(cmd_line, expected_rc) @@ -70,7 +70,7 @@ class MultiplexTests(unittest.TestCase): self.run_and_check(cmd_line, expected_rc) def test_run_mplex_sleeptest(self): - cmd_line = './scripts/avocado run sleeptest --multiplex tests/sleeptest/sleeptest.mplx' + cmd_line = './scripts/avocado run sleeptest --multiplex tests/sleeptest.data/sleeptest.mplx' expected_rc = 0 # A typical sleeptest has about 14 lines of output, # so we expect the full job log has at least 3 times @@ -79,12 +79,12 @@ class MultiplexTests(unittest.TestCase): self.run_and_check(cmd_line, expected_rc, 14*3) def test_run_mplex_doublesleep(self): - cmd_line = './scripts/avocado run "sleeptest sleeptest" --multiplex tests/sleeptest/sleeptest.mplx' + cmd_line = './scripts/avocado run "sleeptest sleeptest" --multiplex tests/sleeptest.data/sleeptest.mplx' expected_rc = 0 self.run_and_check(cmd_line, expected_rc) def test_run_mplex_failtest(self): - cmd_line = './scripts/avocado run "sleeptest failtest" --multiplex tests/sleeptest/sleeptest.mplx' + cmd_line = './scripts/avocado run "sleeptest failtest" --multiplex tests/sleeptest.data/sleeptest.mplx' expected_rc = 1 self.run_and_check(cmd_line, expected_rc) diff --git a/selftests/all/functional/avocado/standalone_tests.py b/selftests/all/functional/avocado/standalone_tests.py index a6b7c605..a0efffca 100644 --- a/selftests/all/functional/avocado/standalone_tests.py +++ b/selftests/all/functional/avocado/standalone_tests.py @@ -44,27 +44,27 @@ class StandaloneTests(unittest.TestCase): "%d:\n%s" % (tstname, expected_rc, result)) def test_sleeptest(self): - cmd_line = './tests/sleeptest/sleeptest.py' + cmd_line = './tests/sleeptest.py' expected_rc = 0 self.run_and_check(cmd_line, expected_rc, 'sleeptest') def test_skiptest(self): - cmd_line = './tests/skiptest/skiptest.py' + cmd_line = './tests/skiptest.py' expected_rc = 0 self.run_and_check(cmd_line, expected_rc, 'skiptest') def test_failtest(self): - cmd_line = './tests/failtest/failtest.py' + cmd_line = './tests/failtest.py' expected_rc = 1 self.run_and_check(cmd_line, expected_rc, 'failtest') def test_errortest(self): - cmd_line = './tests/errortest/errortest.py' + cmd_line = './tests/errortest.py' expected_rc = 1 self.run_and_check(cmd_line, expected_rc, 'errortest') def test_warntest(self): - cmd_line = './tests/warntest/warntest.py' + cmd_line = './tests/warntest.py' expected_rc = 1 self.run_and_check(cmd_line, expected_rc, 'warntest') -- GitLab