diff --git a/avocado/core/varianter.py b/avocado/core/varianter.py index ae6d9041042628bc290b24a5906b44dc141fa5f5..92ceced6b6e0a779cee51d06ff4ce7053228b623 100644 --- a/avocado/core/varianter.py +++ b/avocado/core/varianter.py @@ -631,4 +631,4 @@ class Varianter(object): else: # No variants, use template yield {"variant": self._default_params.get_leaves(), "variant_id": None, - "mux_path": "/run"} + "mux_path": ["/run/*"]} diff --git a/selftests/functional/test_basic.py b/selftests/functional/test_basic.py index 468b7d57b46c02c13b5fcf7a485f2f92212d5548..d36f850d6ce0db2b65a064171487a1a64ef236dc 100644 --- a/selftests/functional/test_basic.py +++ b/selftests/functional/test_basic.py @@ -189,6 +189,11 @@ class RunnerOperationTest(unittest.TestCase): cmd_line = ('%s run --sysinfo=off --job-results-dir %s ' 'passtest.py passtest.py' % (AVOCADO, self.tmpdir)) process.run(cmd_line) + # Also check whether jobdata contains correct mux_path + variants = open(os.path.join(self.tmpdir, "latest", "jobdata", + "variants.json")).read() + self.assertIn('["/run/*"]', variants, "mux_path stored in jobdata " + "does not contains [\"/run/*\"]\n%s" % variants) def test_runner_failfast(self): os.chdir(basedir) diff --git a/selftests/functional/test_multiplex.py b/selftests/functional/test_multiplex.py index 94383d2dc28f9eda70e208629952450527152618..d112bf4e49d3eba2ddb62dcfdda2eacc09eea29d 100644 --- a/selftests/functional/test_multiplex.py +++ b/selftests/functional/test_multiplex.py @@ -78,13 +78,25 @@ class MultiplexTests(unittest.TestCase): % (AVOCADO, self.tmpdir)) expected_rc = exit_codes.AVOCADO_ALL_OK self.run_and_check(cmd_line, expected_rc, (4, 0)) + # Also check whether jobdata contains correct mux_path + variants = open(os.path.join(self.tmpdir, "latest", "jobdata", + "variants.json")).read() + self.assertIn('["/run/*"]', variants, "mux_path stored in jobdata " + "does not contains [\"/run/*\"]\n%s" % variants) def test_run_mplex_doublepass(self): cmd_line = ('%s run --job-results-dir %s --sysinfo=off ' 'passtest.py passtest.py -m ' - 'examples/tests/sleeptest.py.data/sleeptest.yaml' + 'examples/tests/sleeptest.py.data/sleeptest.yaml ' + '--mux-path /foo/\\* /bar/\\* /baz/\\*' % (AVOCADO, self.tmpdir)) self.run_and_check(cmd_line, exit_codes.AVOCADO_ALL_OK, (8, 0)) + # Also check whether jobdata contains correct mux_path + variants = open(os.path.join(self.tmpdir, "latest", "jobdata", + "variants.json")).read() + exp = '["/foo/*", "/bar/*", "/baz/*"]' + self.assertIn(exp, variants, "mux_path stored in jobdata " + "does not contains %s\n%s" % (exp, variants)) def test_run_mplex_failtest(self): cmd_line = ('%s run --job-results-dir %s --sysinfo=off '