x/cloud-init
Code Issues Proposed changes

pep8 and pylint

Browse Source
This commit is contained in:
Scott Moser 2012-03-08 14:21:48 -05:00
parent da1b98981f
commit 7390f29456
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unittests/test_datasource/test_maas.py
View File

@ -1,8 +1,6 @@
from unittest import TestCase
from tempfile import mkdtemp from tempfile import mkdtemp
from shutil import rmtree from shutil import rmtree
import os import os
import urllib2
from StringIO import StringIO from StringIO import StringIO
from copy import copy from copy import copy
from cloudinit.DataSourceMaaS import ( from cloudinit.DataSourceMaaS import (
@ -29,7 +27,8 @@ class TestMaasDataSource(MockerTestCase):
def test_seed_dir_valid(self): def test_seed_dir_valid(self):
"""Verify a valid seeddir is read as such""" """Verify a valid seeddir is read as such"""
data = {'instance-id': 'i-valid01', 'local-hostname': 'valid01-hostname', data = {'instance-id': 'i-valid01',
'local-hostname': 'valid01-hostname',
'user-data': 'valid01-userdata'} 'user-data': 'valid01-userdata'}
my_d = os.path.join(self.tmp, "valid") my_d = os.path.join(self.tmp, "valid")
@ -99,7 +98,8 @@ class TestMaasDataSource(MockerTestCase):
def test_seed_url_valid(self): def test_seed_url_valid(self):
"""Verify that valid seed_url is read as such""" """Verify that valid seed_url is read as such"""
valid = {'meta-data/instance-id': 'i-instanceid', valid = {'meta-data/instance-id': 'i-instanceid',
'meta-data/local-hostname': 'test-hostname', 'user-data': 'foodata'} 'meta-data/local-hostname': 'test-hostname',
'user-data': 'foodata'}
my_seed = "http://example.com/xmeta" my_seed = "http://example.com/xmeta"
my_ver = "1999-99-99" my_ver = "1999-99-99"
@ -108,8 +108,10 @@ class TestMaasDataSource(MockerTestCase):
def my_headers_cb(url): def my_headers_cb(url):
return(my_headers) return(my_headers)
mock_request = self.mocker.replace("urllib2.Request", passthrough=False) mock_request = self.mocker.replace("urllib2.Request",
mock_urlopen = self.mocker.replace("urllib2.urlopen", passthrough=False) passthrough=False)
mock_urlopen = self.mocker.replace("urllib2.urlopen",
passthrough=False)
for (key, val) in valid.iteritems(): for (key, val) in valid.iteritems():
mock_request("%s/%s/%s" % (my_seed, my_ver, key), mock_request("%s/%s/%s" % (my_seed, my_ver, key),