summaryrefslogtreecommitdiff
path: root/tests/cloud_tests/util.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2018-03-15 12:39:32 -0400
committerScott Moser <smoser@brickies.net>2018-03-15 12:39:32 -0400
commit2f5d4cebb243cf2f30c665f034668ba4b14178f9 (patch)
treead3d68b872b4dbdc759a005e5ded034b3d4de02c /tests/cloud_tests/util.py
parentbef2f2c945fdee4a1141c3177b3e48b1537027e4 (diff)
downloadvyos-cloud-init-2f5d4cebb243cf2f30c665f034668ba4b14178f9.tar.gz
vyos-cloud-init-2f5d4cebb243cf2f30c665f034668ba4b14178f9.zip
tests: fix run_tree and bddeb
This was broken probably when we inserted the ssh keys into Platform.   tox -e citest tree_run and   tox -e citest bddeb would fail with KeyError in Platform.init due to lack of a data_dir. Also here are a few fixes found from attempting to make it work.
Diffstat (limited to 'tests/cloud_tests/util.py')
-rw-r--r--tests/cloud_tests/util.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/cloud_tests/util.py b/tests/cloud_tests/util.py
index 6ff285e7..3dd4996d 100644
--- a/tests/cloud_tests/util.py
+++ b/tests/cloud_tests/util.py
@@ -460,6 +460,10 @@ class PlatformError(IOError):
IOError.__init__(self, message)
+def mkdtemp(prefix='cloud_test_data'):
+ return tempfile.mkdtemp(prefix=prefix)
+
+
class TempDir(object):
"""Configurable temporary directory like tempfile.TemporaryDirectory."""
@@ -480,7 +484,7 @@ class TempDir(object):
@return_value: tempdir path
"""
if not self.tmpdir:
- self.tmpdir = tempfile.mkdtemp(prefix=self.prefix)
+ self.tmpdir = mkdtemp(prefix=self.prefix)
LOG.debug('using tmpdir: %s', self.tmpdir)
return self.tmpdir