Browse code

test: extend timeout in ICT tests to the IC controller resync interval

Michail Kargakis authored on 2016/08/16 20:40:33
Showing 1 changed files
... ...
@@ -296,7 +296,9 @@ func TestTriggers_imageChange_nonAutomatic(t *testing.T) {
296 296
 	var newConfig *deployapi.DeploymentConfig
297 297
 	t.Log("Waiting for the initial deploymentconfig update in response to the imagestream update")
298 298
 
299
-	timeout := time.After(30 * time.Second)
299
+	// TODO: Once https://github.com/openshift/origin/pull/9349 is merged, we can stop waiting for the image
300
+	// change controller ie. we can reduce this
301
+	timeout := time.After(2 * time.Minute)
300 302
 
301 303
 	// This is the initial deployment with automatic=false in its ICT - it should be updated to pullSpec
302 304
 out:
... ...
@@ -444,7 +446,9 @@ func TestTriggers_MultipleICTs(t *testing.T) {
444 444
 		t.Fatalf("Couldn't create deploymentconfig: %v", err)
445 445
 	}
446 446
 
447
-	timeout := time.After(30 * time.Second)
447
+	// TODO: Once https://github.com/openshift/origin/pull/9349 is merged, we can stop waiting for the image
448
+	// change controller ie. we can reduce this
449
+	timeout := time.After(2 * time.Minute)
448 450
 
449 451
 	t.Log("Should not trigger a new deployment in response to the first imagestream update")
450 452
 	createTagEvent(imageStream.Name, imageapi.DefaultImageTag, updatedImage, updatedPullSpec)