提交 e5bf8a31 编写于 作者: R Rudá Moura

selftests..multiplex_tests: Fix regression due the number of lines.

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: NRudá Moura <rmoura@redhat.com>
上级 4253e3e7
...@@ -76,16 +76,16 @@ class MultiplexTests(unittest.TestCase): ...@@ -76,16 +76,16 @@ class MultiplexTests(unittest.TestCase):
def test_run_mplex_passtest(self): def test_run_mplex_passtest(self):
cmd_line = './scripts/avocado run --sysinfo=off passtest --multiplex examples/tests/sleeptest.py.data/sleeptest.yaml' cmd_line = './scripts/avocado run --sysinfo=off passtest --multiplex examples/tests/sleeptest.py.data/sleeptest.yaml'
expected_rc = 0 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 # so we expect the full job log has at least 4 times
# this value. If that is not the case, something is wrong with # this value. If that is not the case, something is wrong with
# the output. # 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): def test_run_mplex_doublepass(self):
cmd_line = './scripts/avocado run --sysinfo=off passtest passtest --multiplex examples/tests/sleeptest.py.data/sleeptest.yaml' 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 # 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): def test_run_mplex_failtest(self):
cmd_line = './scripts/avocado run --sysinfo=off passtest failtest --multiplex examples/tests/sleeptest.py.data/sleeptest.yaml' 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): ...@@ -97,11 +97,11 @@ class MultiplexTests(unittest.TestCase):
'examples/tests/sleeptest.py.data/sleeptest.yaml ' 'examples/tests/sleeptest.py.data/sleeptest.yaml '
'examples/tests/sleeptest.py.data/sleeptest.yaml') 'examples/tests/sleeptest.py.data/sleeptest.yaml')
expected_rc = 0 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 # so we expect the full job log has at least 4 times
# this value. If that is not the case, something is wrong with # this value. If that is not the case, something is wrong with
# the output. # 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): def test_run_mplex_params(self):
cmd_line = ('./scripts/avocado run --sysinfo=off examples/tests/env_variables.sh ' cmd_line = ('./scripts/avocado run --sysinfo=off examples/tests/env_variables.sh '
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册