summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2015-05-08 13:16:44 +0100
committerDaniel Watkins <daniel.watkins@canonical.com>2015-05-08 13:16:44 +0100
commit9c7643c4a0dee7843963709c361b755baf843a4b (patch)
tree3d7c1ec3cbe567fb647ffb0da4b483faccbc8f7a /tests
parentb9f26689e8b3bb7a3486771c6362107232a7dcf4 (diff)
downloadvyos-cloud-init-9c7643c4a0dee7843963709c361b755baf843a4b.tar.gz
vyos-cloud-init-9c7643c4a0dee7843963709c361b755baf843a4b.zip
Stop using Python 3 only tempfile.TemporaryDirectory (but lose free cleanup).
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_datasource/test_azure_helper.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/unittests/test_datasource/test_azure_helper.py b/tests/unittests/test_datasource/test_azure_helper.py
index 47b77840..398a9007 100644
--- a/tests/unittests/test_datasource/test_azure_helper.py
+++ b/tests/unittests/test_datasource/test_azure_helper.py
@@ -273,15 +273,20 @@ class TestOpenSSLManager(TestCase):
self.subp = patches.enter_context(
mock.patch.object(azure_helper.util, 'subp'))
+ try:
+ self.open = patches.enter_context(
+ mock.patch('__builtin__.open'))
+ except ImportError:
+ self.open = patches.enter_context(
+ mock.patch('builtins.open'))
@mock.patch.object(azure_helper, 'cd', mock.MagicMock())
- @mock.patch.object(azure_helper.tempfile, 'TemporaryDirectory')
- def test_openssl_manager_creates_a_tmpdir(self, TemporaryDirectory):
+ @mock.patch.object(azure_helper.tempfile, 'mkdtemp')
+ def test_openssl_manager_creates_a_tmpdir(self, mkdtemp):
manager = azure_helper.OpenSSLManager()
- self.assertEqual(TemporaryDirectory.return_value, manager.tmpdir)
+ self.assertEqual(mkdtemp.return_value, manager.tmpdir)
- @mock.patch('builtins.open')
- def test_generate_certificate_uses_tmpdir(self, open):
+ def test_generate_certificate_uses_tmpdir(self):
subp_directory = {}
def capture_directory(*args, **kwargs):
@@ -289,7 +294,7 @@ class TestOpenSSLManager(TestCase):
self.subp.side_effect = capture_directory
manager = azure_helper.OpenSSLManager()
- self.assertEqual(manager.tmpdir.name, subp_directory['path'])
+ self.assertEqual(manager.tmpdir, subp_directory['path'])
class TestWALinuxAgentShim(TestCase):