summaryrefslogtreecommitdiff
path: root/tests/unittests/test_datasource
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-01-06 12:02:38 -0500
committerScott Moser <smoser@ubuntu.com>2015-01-06 12:02:38 -0500
commit38c851e58e09c5574661ef4b2d2e66f6e38063d1 (patch)
treed136c739ba324802e90b7afede5429254e519475 /tests/unittests/test_datasource
parentfa5ce8c40621c78e61c7d9bd073903101f7d6a5e (diff)
downloadvyos-cloud-init-38c851e58e09c5574661ef4b2d2e66f6e38063d1.tar.gz
vyos-cloud-init-38c851e58e09c5574661ef4b2d2e66f6e38063d1.zip
tools/run-pep8: remove leading ',' fed to --ignore
--ignore was being called with ',E121,E...' rather than 'E121,E...'. that resulted in odd behavior, missing the pep8 errors that are fixed here.
Diffstat (limited to 'tests/unittests/test_datasource')
-rw-r--r--tests/unittests/test_datasource/test_digitalocean.py1
-rw-r--r--tests/unittests/test_datasource/test_gce.py3
-rw-r--r--tests/unittests/test_datasource/test_smartos.py4
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/unittests/test_datasource/test_digitalocean.py b/tests/unittests/test_datasource/test_digitalocean.py
index 04bee340..d1270fc2 100644
--- a/tests/unittests/test_datasource/test_digitalocean.py
+++ b/tests/unittests/test_datasource/test_digitalocean.py
@@ -51,6 +51,7 @@ DO_META = {
MD_URL_RE = re.compile(r'http://169.254.169.254/metadata/v1/.*')
+
def _request_callback(method, uri, headers):
url_path = urlparse(uri).path
if url_path.startswith('/metadata/v1/'):
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
index 60a0ce48..842a72ba 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/test_datasource/test_gce.py
@@ -40,7 +40,8 @@ GCE_META_PARTIAL = {
}
HEADERS = {'X-Google-Metadata-Request': 'True'}
-MD_URL_RE = re.compile(r'http://metadata.google.internal./computeMetadata/v1/.*')
+MD_URL_RE = re.compile(
+ r'http://metadata.google.internal./computeMetadata/v1/.*')
def _request_callback(method, uri, headers):
diff --git a/tests/unittests/test_datasource/test_smartos.py b/tests/unittests/test_datasource/test_smartos.py
index b197b600..65675106 100644
--- a/tests/unittests/test_datasource/test_smartos.py
+++ b/tests/unittests/test_datasource/test_smartos.py
@@ -342,8 +342,8 @@ class TestSmartOSDataSource(helpers.FilesystemMockingTestCase):
"""
User-data in the SmartOS world is supposed to be written to a file
each and every boot. This tests to make sure that in the event the
- legacy user-data is removed, the existing user-data is backed-up and
- there is no /var/db/user-data left.
+ legacy user-data is removed, the existing user-data is backed-up
+ and there is no /var/db/user-data left.
"""
user_data_f = "%s/mdata-user-data" % self.legacy_user_d