commit c330f6f28b1cf1b88d765795232ca7229e861263
author Kevin Cheng <kevcheng@google.com> Mon May 13 09:32:42 2019 -0700
committer Kevin Cheng <kevcheng@google.com> Mon May 13 14:37:44 2019 -0700
tree 167022e92b2ef2874e00a805469006ebfd9e763d
parent 62a213e83a00235bc9601e7116cad7efe87553a7

Cherrypick cl/230919088 and cl/231435617

Bug: 123894473
Test: atest acloud_test --host
Change-Id: I18afbcd794399adf1c2f2b274dd1ea689d30d685

public/device_driver_test.py

diff --git a/public/device_driver_test.py b/public/device_driver_test.py
index 9d4f8cb..60b0fb1 100644
--- a/public/device_driver_test.py
+++ b/public/device_driver_test.py
@@ -48,6 +48,7 @@
         4: "extradisk-image-4gb",
         10: "extradisk-image-10gb"
     }
+    cfg.extra_scopes = None
     cfg.ssh_private_key_path = ""
     cfg.ssh_public_key_path = ""
 
@@ -109,7 +110,8 @@
             instance=fake_instance,
             image_name=fake_image,
             extra_disk_name=disk_name,
-            avd_spec=None)
+            avd_spec=None,
+            extra_scopes=None)
         self.compute_client.DeleteImage.assert_called_with(fake_image)
         self.storage_client.Delete(cfg.storage_bucket_name, fake_gs_object)