From e5bf8a3170e80b0c5c1bbf019a1f60d41d19e1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rud=C3=A1=20Moura?= Date: Tue, 10 Mar 2015 21:29:30 -0300 Subject: [PATCH] selftests..multiplex_tests: Fix regression due the number of lines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix regression when the number of lines from the output was reduced, so we're now assuming 13 lines, instead of 14. Fix issue #472. Signed-off-by: Rudá Moura --- selftests/all/functional/avocado/multiplex_tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/selftests/all/functional/avocado/multiplex_tests.py b/selftests/all/functional/avocado/multiplex_tests.py index c87cb0ac..e5effc06 100644 --- a/selftests/all/functional/avocado/multiplex_tests.py +++ b/selftests/all/functional/avocado/multiplex_tests.py @@ -76,16 +76,16 @@ class MultiplexTests(unittest.TestCase): def test_run_mplex_passtest(self): cmd_line = './scripts/avocado run --sysinfo=off passtest --multiplex examples/tests/sleeptest.py.data/sleeptest.yaml' expected_rc = 0 - # A typical pass has about 14 lines of output, + # A typical pass has about 13 lines of output, # so we expect the full job log has at least 4 times # this value. If that is not the case, something is wrong with # the output. - self.run_and_check(cmd_line, expected_rc, 14 * 4) + self.run_and_check(cmd_line, expected_rc, 13 * 4) def test_run_mplex_doublepass(self): cmd_line = './scripts/avocado run --sysinfo=off passtest passtest --multiplex examples/tests/sleeptest.py.data/sleeptest.yaml' # Should run 2-times 4 variants of pass test - self.run_and_check(cmd_line, expected_rc=0, expected_lines=2 * 4 * 14) + self.run_and_check(cmd_line, expected_rc=0, expected_lines=2 * 4 * 13) def test_run_mplex_failtest(self): cmd_line = './scripts/avocado run --sysinfo=off passtest failtest --multiplex examples/tests/sleeptest.py.data/sleeptest.yaml' @@ -97,11 +97,11 @@ class MultiplexTests(unittest.TestCase): 'examples/tests/sleeptest.py.data/sleeptest.yaml ' 'examples/tests/sleeptest.py.data/sleeptest.yaml') expected_rc = 0 - # A typical pass has about 14 lines of output, + # A typical pass has about 13 lines of output, # so we expect the full job log has at least 4 times # this value. If that is not the case, something is wrong with # the output. - self.run_and_check(cmd_line, expected_rc, 14 * 4) + self.run_and_check(cmd_line, expected_rc, 13 * 4) def test_run_mplex_params(self): cmd_line = ('./scripts/avocado run --sysinfo=off examples/tests/env_variables.sh ' -- GitLab