summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.ledkov@canonical.com>2014-07-23 17:13:03 +0100
committerDimitri John Ledkov <dimitri.ledkov@canonical.com>2014-07-23 17:13:03 +0100
commitf9f97a734001b986b4f3be00a662de9218be71a7 (patch)
treee88fde8d48770dc765318251698b4f54a4666c6f /tests
parent3cb605bf3cad72e692c154d41fb1e24b41033f2c (diff)
downloadvyos-cloud-init-f9f97a734001b986b4f3be00a662de9218be71a7.tar.gz
vyos-cloud-init-f9f97a734001b986b4f3be00a662de9218be71a7.zip
more import statements
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_data.py2
-rw-r--r--tests/unittests/test_ec2_util.py2
-rw-r--r--tests/unittests/test_merging.py2
-rw-r--r--tests/unittests/test_pathprefix2dict.py2
-rw-r--r--tests/unittests/test_templating.py2
-rw-r--r--tests/unittests/test_util.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/unittests/test_data.py b/tests/unittests/test_data.py
index 68729c57..41d0dc29 100644
--- a/tests/unittests/test_data.py
+++ b/tests/unittests/test_data.py
@@ -20,7 +20,7 @@ from cloudinit import util
INSTANCE_ID = "i-testing"
-from tests.unittests import helpers
+from . import helpers
class FakeDataSource(sources.DataSource):
diff --git a/tests/unittests/test_ec2_util.py b/tests/unittests/test_ec2_util.py
index dd87665d..26cd12ec 100644
--- a/tests/unittests/test_ec2_util.py
+++ b/tests/unittests/test_ec2_util.py
@@ -1,4 +1,4 @@
-from tests.unittests import helpers
+from . import helpers
from cloudinit import ec2_utils as eu
from cloudinit import url_helper as uh
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py
index 486b9158..17704f8e 100644
--- a/tests/unittests/test_merging.py
+++ b/tests/unittests/test_merging.py
@@ -1,4 +1,4 @@
-from tests.unittests import helpers
+from . import helpers
from cloudinit.handlers import cloud_config
from cloudinit.handlers import (CONTENT_START, CONTENT_END)
diff --git a/tests/unittests/test_pathprefix2dict.py b/tests/unittests/test_pathprefix2dict.py
index c68c263c..cedb391a 100644
--- a/tests/unittests/test_pathprefix2dict.py
+++ b/tests/unittests/test_pathprefix2dict.py
@@ -1,7 +1,7 @@
from cloudinit import util
from mocker import MockerTestCase
-from tests.unittests.helpers import populate_dir
+from ..helpers import populate_dir
class TestPathPrefix2Dict(MockerTestCase):
diff --git a/tests/unittests/test_templating.py b/tests/unittests/test_templating.py
index 1ec3004b..87681f0f 100644
--- a/tests/unittests/test_templating.py
+++ b/tests/unittests/test_templating.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from tests.unittests import helpers as test_helpers
+from . import helpers as test_helpers
import textwrap
from cloudinit import templater
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 38ab0c96..335ab730 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -5,7 +5,7 @@ import stat
import yaml
from mocker import MockerTestCase
-from tests.unittests import helpers
+from . import helpers
from unittest import TestCase
from cloudinit import importer