commit 308f766bffa630994aaa6ec83849bfef815b872e
author herbertxue <herbertxue@google.com> Fri May 18 03:25:58 2018 +0000
committer herbertxue <herbertxue@google.com> Wed May 30 07:49:49 2018 +0000
tree 1809bb44380e8bdeec899979f2d16bae61bb5d8e
parent b21d771cf5063f8df7a9e77bc2a1154aac8ff205

Update gstorage_client and android_compute_client to be pylint compliant.

- 4 space convention
- pass with new pylintrc file
- fix pylint errors
- Add some pylint disable comments to avoid pylint error temporarily

Bug: None
Test: pylint internal/lib/gstorage_client.py
      pylint internal/lib/gstorage_client_test.py
      pylint internal/lib/android_compute_client.py
      pylint internal/lib/android_compute_client_test.py
Change-Id: I9e3f334d1976321566eb53df11a013ad159902ee

internal/lib/gcompute_client_test.py

diff --git a/internal/lib/gcompute_client_test.py b/internal/lib/gcompute_client_test.py
index 7535a72..2ce4c90 100644
--- a/internal/lib/gcompute_client_test.py
+++ b/internal/lib/gcompute_client_test.py
@@ -205,6 +205,9 @@
     # pyformat: enable
     def testCreateImage(self, source_uri, source_disk, labels, expected_body):
         """Test CreateImage."""
+        mock_check = self.Patch(gcompute_client.ComputeClient,
+                                "CheckImageExists",
+                                return_value=False)
         mock_wait = self.Patch(gcompute_client.ComputeClient, "WaitOnOperation")
         resource_mock = mock.MagicMock()
         self.compute_client._service.images = mock.MagicMock(
@@ -218,6 +221,7 @@
         mock_wait.assert_called_with(
             operation=mock.ANY,
             operation_scope=gcompute_client.OperationScope.GLOBAL)
+        mock_check.assert_called_with(self.IMAGE)
 
     @mock.patch.object(gcompute_client.ComputeClient, "GetImage")
     def testSetImageLabel(self, mock_get_image):
@@ -249,6 +253,7 @@
         (None, None))
     def testCreateImageRaiseDriverError(self, source_uri, source_disk):
         """Test CreateImage."""
+        self.Patch(gcompute_client.ComputeClient, "CheckImageExists", return_value=False)
         self.assertRaises(errors.DriverError, self.compute_client.CreateImage,
                           image_name=self.IMAGE, source_uri=source_uri,
                           source_disk=source_disk)
@@ -256,7 +261,7 @@
 
     @mock.patch.object(gcompute_client.ComputeClient, "DeleteImage")
     @mock.patch.object(gcompute_client.ComputeClient, "CheckImageExists",
-                       return_value=True)
+                       side_effect=[False, True])
     @mock.patch.object(gcompute_client.ComputeClient, "WaitOnOperation",
                        side_effect=errors.DriverError("Expected fake error"))
     def testCreateImageFail(self, mock_wait, mock_check, mock_delete):
@@ -457,6 +462,13 @@
         self.compute_client._service.instances = mock.MagicMock(
             return_value=resource_mock)
         resource_mock.insert = mock.MagicMock()
+        self.Patch(
+            self.compute_client,
+            "_GetExtraDiskArgs",
+            return_value=[{"fake_extra_arg": "fake_extra_value"}])
+        extra_disk_name = "gce-x86-userdebug-2345-abcd-data"
+        expected_disk_args = [self._disk_args]
+        expected_disk_args.extend([{"fake_extra_arg": "fake_extra_value"}])
 
         expected_body = {
             "machineType": self.MACHINE_TYPE_URL,
@@ -470,7 +482,7 @@
                     ],
                 }
             ],
-            "disks": [self._disk_args],
+            "disks": expected_disk_args,
             "serviceAccounts": [
                 {"email": "default",
                  "scopes": self.compute_client.DEFAULT_INSTANCE_SCOPE}
@@ -487,7 +499,8 @@
             machine_type=self.MACHINE_TYPE,
             metadata={self.METADATA[0]: self.METADATA[1]},
             network=self.NETWORK,
-            zone=self.ZONE)
+            zone=self.ZONE,
+            extra_disk_name=extra_disk_name)
 
         resource_mock.insert.assert_called_with(
             project=PROJECT, zone=self.ZONE, body=expected_body)