diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-07-02 13:51:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 11:51:28 -0600 |
| commit | 2b727914e8cbee6810b1bb9a1cfdb90ad521ceb6 (patch) | |
| tree | 41c2b91e3509da06cf6ed2c536b7e0032609209d /tests/unittests | |
| parent | e31f7fe43aa8f352097c4bb3e97fc3acca8a26b7 (diff) | |
| download | vyos-cloud-init-2b727914e8cbee6810b1bb9a1cfdb90ad521ceb6.tar.gz vyos-cloud-init-2b727914e8cbee6810b1bb9a1cfdb90ad521ceb6.zip | |
tests: use markers to configure disable_subp_usage (#473)
This is an improvement over indirect parameterisation for a few reasons:
* The test code is much easier to read, the mark names are much more
intuitive than the indirect parameterisation invocation, and there's
less boilerplate to boot
* The fixture no longer has to overload the single parameter that
fixtures can take with multiple meanings
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_datasource/test_opennebula.py | 3 | ||||
| -rw-r--r-- | tests/unittests/test_render_cloudcfg.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py index 80841182..9c6070a5 100644 --- a/tests/unittests/test_datasource/test_opennebula.py +++ b/tests/unittests/test_datasource/test_opennebula.py @@ -928,8 +928,7 @@ class TestOpenNebulaNetwork(unittest.TestCase): class TestParseShellConfig: - - @pytest.mark.parametrize('disable_subp_usage', ['bash'], indirect=True) + @pytest.mark.allow_subp_for("bash") def test_no_seconds(self): cfg = '\n'.join(["foo=bar", "SECONDS=2", "xx=foo"]) # we could test 'sleep 2', but that would make the test run slower. diff --git a/tests/unittests/test_render_cloudcfg.py b/tests/unittests/test_render_cloudcfg.py index 696915a3..495e2669 100644 --- a/tests/unittests/test_render_cloudcfg.py +++ b/tests/unittests/test_render_cloudcfg.py @@ -13,7 +13,7 @@ DISTRO_VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu", "unknown"] -@pytest.mark.parametrize('disable_subp_usage', [sys.executable], indirect=True) +@pytest.mark.allow_subp_for(sys.executable) class TestRenderCloudCfg: cmd = [sys.executable, os.path.realpath('tools/render-cloudcfg')] |