testing(iam): fix failing cleanup code (GoogleCloudPlatform#4495)

Takashi Matsuo · web-flow · commit 1f68b0d62f83 · 2020-08-13T13:37:05.000-07:00
fixes GoogleCloudPlatform#4486
diff --git a/iam/api-client/service_accounts.py b/iam/api-client/service_accounts.py
@@ -146,7 +146,7 @@ def enable_service_account(email):
     service.projects().serviceAccounts().enable(
         name='projects/-/serviceAccounts/' + email).execute()
 
-    print("Disabled service account :" + email)
+    print("Enabled service account :" + email)
 # [END iam_enable_service_account]
 
 
diff --git a/iam/api-client/service_accounts_test.py b/iam/api-client/service_accounts_test.py
@@ -40,8 +40,9 @@ def test_service_accounts(capsys):
         try:
             service_accounts.delete_service_account(unique_id)
         except HttpError as e:
-            # When the service account doesn't exist, the service returns 403.
-            if '403' in str(e):
-                print("Ignoring 403 error upon cleanup.")
+            # We've recently seen 404 error too.
+            # It used to return 403, so we keep it too.
+            if '403' in str(e) or '404' in str(e):
+                print("Ignoring 404/403 error upon cleanup.")
             else:
                 raise
