summaryrefslogtreecommitdiff
path: root/tests/unittests/test_data.py
diff options
context:
space:
mode:
authorSankar Tanguturi <stanguturi@stanguturi-rhel>2016-03-11 11:29:15 -0800
committerSankar Tanguturi <stanguturi@stanguturi-rhel>2016-03-11 11:29:15 -0800
commita3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691 (patch)
tree74a6ebbe7c91c30467577eb231fab8c5f188b93c /tests/unittests/test_data.py
parenta6e0922a4d34ede6df000dd8fc4bb3531218d69f (diff)
parent41470d29f5888baf7ec78e170cc0d6d981dcf63e (diff)
downloadvyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.tar.gz
vyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.zip
- Executed 'bzr merge' and resolved all the conflicts.
- Now my branch is identical to trunk.dist
Diffstat (limited to 'tests/unittests/test_data.py')
-rw-r--r--tests/unittests/test_data.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/unittests/test_data.py b/tests/unittests/test_data.py
index c603bfdb..9c1ec1d4 100644
--- a/tests/unittests/test_data.py
+++ b/tests/unittests/test_data.py
@@ -27,11 +27,12 @@ from cloudinit import stages
from cloudinit import user_data as ud
from cloudinit import util
-INSTANCE_ID = "i-testing"
-
from . import helpers
+INSTANCE_ID = "i-testing"
+
+
class FakeDataSource(sources.DataSource):
def __init__(self, userdata=None, vendordata=None):