summaryrefslogtreecommitdiff
path: root/tests/unittests/test_datasource/test_azure_helper.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-05-19 14:26:30 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-05-19 14:26:30 -0700
commit6b97c4e462b19374d6af807b1f5b9c087aa97996 (patch)
tree3628a55f69b61644a519d5df40398d55ba55186c /tests/unittests/test_datasource/test_azure_helper.py
parentea4bc2c603a9d964a918e01d00e39a851e979830 (diff)
parent880d9fc2f9c62abf19b1506595aa81e5417dea45 (diff)
downloadvyos-cloud-init-6b97c4e462b19374d6af807b1f5b9c087aa97996.tar.gz
vyos-cloud-init-6b97c4e462b19374d6af807b1f5b9c087aa97996.zip
Remerge against head/master
Diffstat (limited to 'tests/unittests/test_datasource/test_azure_helper.py')
-rw-r--r--tests/unittests/test_datasource/test_azure_helper.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/unittests/test_datasource/test_azure_helper.py b/tests/unittests/test_datasource/test_azure_helper.py
index d07a1f07..d7037830 100644
--- a/tests/unittests/test_datasource/test_azure_helper.py
+++ b/tests/unittests/test_datasource/test_azure_helper.py
@@ -2,17 +2,10 @@ import os
from cloudinit.sources.helpers import azure as azure_helper
+from ..helpers import ExitStack
from ..helpers import TestCase
-try:
- from unittest import mock
-except ImportError:
- import mock
-
-try:
- from contextlib import ExitStack
-except ImportError:
- from contextlib2 import ExitStack
+from ..helpers import mock
GOAL_STATE_TEMPLATE = """\