fix: add retry around ssh test (GoogleCloudPlatform#3287)

Takashi Matsuo · web-flow · commit ce121d4f8db2 · 2020-04-07T11:35:59.000-07:00
fixes GoogleCloudPlatform#3112 This will very likely fix the above issue.
diff --git a/compute/oslogin/requirements-test.txt b/compute/oslogin/requirements-test.txt
@@ -1,2 +1,3 @@
 pytest==5.3.2
 mock==3.0.5
+retrying==1.3.3
diff --git a/compute/oslogin/service_account_ssh_test.py b/compute/oslogin/service_account_ssh_test.py
@@ -11,15 +11,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-import time
-import random
 import base64
 import json
+import os
+import random
+import time
+
 import googleapiclient.discovery
 from google.oauth2 import service_account
+from retrying import retry
+
 from service_account_ssh import main
 
+
 '''
 The service account that runs this test must have the following roles:
 - roles/compute.instanceAdmin.v1
@@ -79,15 +83,17 @@ def test_main(capsys):
         'oslogin', 'v1', cache_discovery=False, credentials=credentials)
     account = 'users/' + account_email
 
-    # Give OS Login some time to catch up.
-    time.sleep(120)
-
-    # Test SSH to the instance.
-    try:
+    @retry(wait_exponential_multiplier=1000, wait_exponential_max=300000,
+           stop_max_attempt_number=10)
+    def ssh_login():
         main(cmd, project, test_id, zone, oslogin, account, hostname)
         out, _ = capsys.readouterr()
         assert_value = 'Linux {test_id}'.format(test_id=test_id)
         assert assert_value in out
+
+    # Test SSH to the instance.
+    try:
+        ssh_login()
     except Exception:
         raise Exception('SSH to the test instance failed.')
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`pytest==5.3.2`
`2`	`2`	`mock==3.0.5`
	`3`	`+retrying==1.3.3`