summaryrefslogtreecommitdiff
path: root/cloudinit/tests/test_conftest.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2020-06-08 12:49:12 -0400
committerGitHub <noreply@github.com>2020-06-08 10:49:12 -0600
commit3c551f6ebc12f7729a2755c89b19b9000e27cc88 (patch)
tree0f7cd7ae6161791e7361e2bdffd38f414857f0c3 /cloudinit/tests/test_conftest.py
parent30aa1197c4c4d35d4ccf77d5d8854a40aa21219f (diff)
downloadvyos-cloud-init-3c551f6ebc12f7729a2755c89b19b9000e27cc88.tar.gz
vyos-cloud-init-3c551f6ebc12f7729a2755c89b19b9000e27cc88.zip
Move subp into its own module. (#416)
This was painful, but it finishes a TODO from cloudinit/subp.py. It moves the following from util to subp: ProcessExecutionError subp which target_path I moved subp_blob_in_tempfile into cc_chef, which is its only caller. That saved us from having to deal with it using write_file and temp_utils from subp (which does not import any cloudinit things now). It is arguable that 'target_path' could be moved to a 'path_utils' or something, but in order to use it from subp and also from utils, we had to get it out of utils.
Diffstat (limited to 'cloudinit/tests/test_conftest.py')
-rw-r--r--cloudinit/tests/test_conftest.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/cloudinit/tests/test_conftest.py b/cloudinit/tests/test_conftest.py
index 773ef8fe..a6537248 100644
--- a/cloudinit/tests/test_conftest.py
+++ b/cloudinit/tests/test_conftest.py
@@ -1,6 +1,6 @@
import pytest
-from cloudinit import util
+from cloudinit import subp
from cloudinit.tests.helpers import CiTestCase
@@ -9,17 +9,17 @@ class TestDisableSubpUsage:
def test_using_subp_raises_assertion_error(self):
with pytest.raises(AssertionError):
- util.subp(["some", "args"])
+ subp.subp(["some", "args"])
def test_typeerrors_on_incorrect_usage(self):
with pytest.raises(TypeError):
# We are intentionally passing no value for a parameter, so:
# pylint: disable=no-value-for-parameter
- util.subp()
+ subp.subp()
@pytest.mark.parametrize('disable_subp_usage', [False], indirect=True)
def test_subp_usage_can_be_reenabled(self):
- util.subp(['whoami'])
+ subp.subp(['whoami'])
@pytest.mark.parametrize(
'disable_subp_usage', [['whoami'], 'whoami'], indirect=True)
@@ -27,18 +27,18 @@ class TestDisableSubpUsage:
# The two parameters test each potential invocation with a single
# argument
with pytest.raises(AssertionError) as excinfo:
- util.subp(["some", "args"])
+ subp.subp(["some", "args"])
assert "allowed: whoami" in str(excinfo.value)
- util.subp(['whoami'])
+ subp.subp(['whoami'])
@pytest.mark.parametrize(
'disable_subp_usage', [['whoami', 'bash']], indirect=True)
def test_subp_usage_can_be_conditionally_reenabled_for_multiple_cmds(self):
with pytest.raises(AssertionError) as excinfo:
- util.subp(["some", "args"])
+ subp.subp(["some", "args"])
assert "allowed: whoami,bash" in str(excinfo.value)
- util.subp(['bash', '-c', 'true'])
- util.subp(['whoami'])
+ subp.subp(['bash', '-c', 'true'])
+ subp.subp(['whoami'])
class TestDisableSubpUsageInTestSubclass(CiTestCase):
@@ -46,16 +46,16 @@ class TestDisableSubpUsageInTestSubclass(CiTestCase):
def test_using_subp_raises_exception(self):
with pytest.raises(Exception):
- util.subp(["some", "args"])
+ subp.subp(["some", "args"])
def test_typeerrors_on_incorrect_usage(self):
with pytest.raises(TypeError):
- util.subp()
+ subp.subp()
def test_subp_usage_can_be_reenabled(self):
_old_allowed_subp = self.allow_subp
self.allowed_subp = True
try:
- util.subp(['bash', '-c', 'true'])
+ subp.subp(['bash', '-c', 'true'])
finally:
self.allowed_subp = _old_allowed_subp