summaryrefslogtreecommitdiff
path: root/tests/unittests/helpers.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-02-11 14:00:20 -0500
committerScott Moser <smoser@ubuntu.com>2015-02-11 14:00:20 -0500
commit35dd98c07bce490e85e03bef872cbbf1185e0be9 (patch)
tree9b71de77b27ca916fa1d869fa95c0a5ab9f5e51c /tests/unittests/helpers.py
parentcd632b2f153a61faa48531cb41d0288650e72c71 (diff)
parent587387cfbff7a89573128dc958df903d1becbde1 (diff)
downloadvyos-cloud-init-35dd98c07bce490e85e03bef872cbbf1185e0be9.tar.gz
vyos-cloud-init-35dd98c07bce490e85e03bef872cbbf1185e0be9.zip
some python3 fixes
This fixes the last set of WARN messages in my testing. * open /dev/console in text mode * move final message to be jinja template by default to avoid a warning about lack of cheetah. * write and read pickle'd contents in binary * some logging tests Also: * add tool tox-venv for simple things like: tox-venv py34 /bin/bash
Diffstat (limited to 'tests/unittests/helpers.py')
-rw-r--r--tests/unittests/helpers.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 6b9394b3..ce77af93 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -254,6 +254,19 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
self.patched_funcs.enter_context(
mock.patch.object(mod, f, trap_func))
+ def patchOpen(self, new_root):
+ trap_func = retarget_many_wrapper(new_root, 1, open)
+ name = 'builtins.open' if PY3 else '__builtin__.open'
+ self.patched_funcs.enter_context(mock.patch(name, trap_func))
+
+ def patchStdoutAndStderr(self, stdout=None, stderr=None):
+ if stdout is not None:
+ self.patched_funcs.enter_context(
+ mock.patch.object(sys, 'stdout', stdout))
+ if stderr is not None:
+ self.patched_funcs.enter_context(
+ mock.patch.object(sys, 'stderr', stderr))
+
class HttprettyTestCase(TestCase):
# necessary as http_proxy gets in the way of httpretty