diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2016-05-11 14:18:02 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2016-05-11 14:18:02 -0700 |
| commit | 26ea813d293467921ab6b1e32abd2ab8fcefa3bd (patch) | |
| tree | bd641e5867bdd96effa33d62e5c200b5dd7e6331 /tests/unittests/test_datasource/test_configdrive.py | |
| parent | 67e506a50dae2b0c1a806f482670b864e84809ae (diff) | |
| download | vyos-cloud-init-26ea813d293467921ab6b1e32abd2ab8fcefa3bd.tar.gz vyos-cloud-init-26ea813d293467921ab6b1e32abd2ab8fcefa3bd.zip | |
Fix py26 for rhel (and older versions of python)
Diffstat (limited to 'tests/unittests/test_datasource/test_configdrive.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_configdrive.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py index 8beaf95e..14cc8266 100644 --- a/tests/unittests/test_datasource/test_configdrive.py +++ b/tests/unittests/test_datasource/test_configdrive.py @@ -5,22 +5,13 @@ import shutil import six import tempfile -try: - from unittest import mock -except ImportError: - import mock -try: - from contextlib import ExitStack -except ImportError: - from contextlib2 import ExitStack - from cloudinit import helpers from cloudinit import settings from cloudinit.sources import DataSourceConfigDrive as ds from cloudinit.sources.helpers import openstack from cloudinit import util -from ..helpers import TestCase +from ..helpers import TestCase, ExitStack, mock PUBKEY = u'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460\n' |