summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Wright <rickw@google.com>2019-04-29 15:44:57 -0700
committerRick Wright <rickw@google.com>2019-04-29 15:44:57 -0700
commitea4836ee63ca99de8c55a8ab58d2eab42ee2d5d8 (patch)
tree2e70a5291d0f4565faa80ea4244aa3e2bbbeed59
parent984c8b5ae2092286093e48c8d72462a9990d97cc (diff)
downloadgoogle-compute-image-packages-ea4836ee63ca99de8c55a8ab58d2eab42ee2d5d8.tar.gz
Fix lint errors.
-rwxr-xr-xpackages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py2
-rw-r--r--packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py8
2 files changed, 1 insertions, 9 deletions
diff --git a/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py
index 2fb7eaf..3350c39 100755
--- a/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py
+++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py
@@ -164,7 +164,7 @@ class InstanceSetup(object):
def _WriteHostKeyToGuestAttributes(self, key_type, key_value):
"""Write a host key to guest attributes, ignoring errors."""
- headers = {'Metadata-Flavor' : 'Google'}
+ headers = {'Metadata-Flavor': 'Google'}
url = GUEST_ATTRIBUTES_URL + key_type
req = PutRequest(url, key_value, headers)
try:
diff --git a/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py
index 1a5c3fd..37be804 100644
--- a/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py
+++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py
@@ -322,15 +322,11 @@ class InstanceSetupTest(unittest.TestCase):
instance_setup.InstanceSetup._SetSshHostKeys(self.mock_setup)
self.mock_instance_config.SetOption.assert_not_called()
-
@mock.patch('google_compute_engine.instance_setup.instance_setup.PutRequest')
@mock.patch('google_compute_engine.instance_setup.instance_setup.urlrequest.urlopen')
def testWriteHostKeyToGuestAttributes(self, mock_urlopen, mock_put_request):
instance_setup.InstanceSetup._WriteHostKeyToGuestAttributes(
self.mock_setup, 'ssh-rsa', 'asdfasdf')
- expected_calls = [
- mock.call('ssh-rsa', 'asdfasdf')
- ]
self.mock_logger.info.assert_called_with(
'Wrote ssh-rsa host key to guest attributes.')
@@ -338,13 +334,9 @@ class InstanceSetupTest(unittest.TestCase):
'http://foo', 403, 'Forbidden', {}, None)
instance_setup.InstanceSetup._WriteHostKeyToGuestAttributes(
self.mock_setup, 'ssh-rsa', 'asdfasdf')
- expected_calls = [
- mock.call('ssh-rsa', 'asdfasdf')
- ]
self.mock_logger.info.assert_called_with(
'Unable to write ssh-rsa host key to guest attributes.')
-
@mock.patch('google_compute_engine.instance_setup.instance_setup.os.listdir')
def testSetSshHostKeysFirstBoot(self, mock_listdir):
self.mock_instance_config.GetOptionString.return_value = None