test/e2e: Bump additional alerting rule timeout

The additional alerting rule is deployed after initial setup, therefore it relies on a ConfigMap remount to happen, which may take up to 5 minutes.
tschuy · Feb 25, 2019 · e1e7ba7 · e1e7ba7
1 parent 836ff4d
commit e1e7ba7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go
@@ -130,10 +130,10 @@ func TestQueryPrometheus(t *testing.T) {
 		},
 	}
 
-	RunTestQueries(t, queries)
+	RunTestQueries(t, time.Minute, queries)
 }
 
-func RunTestQueries(t *testing.T, queries []Query) {
+func RunTestQueries(t *testing.T, timeout time.Duration, queries []Query) {
 	promClient, err := framework.NewPrometheusClient(f.OpenshiftRouteClient, f.KubeClient)
 	if err != nil {
 		t.Fatal(err)
@@ -148,7 +148,7 @@ func RunTestQueries(t *testing.T, queries []Query) {
 		t.Fatal(errors.Wrapf(err, "wait for prometheus-k8s: %v", loopErr))
 	}
 
-	err = wait.Poll(5*time.Second, 1*time.Minute, func() (bool, error) {
+	err = wait.Poll(5*time.Second, timeout, func() (bool, error) {
 		defer t.Log("---------------------------\n")
 
 		for _, q := range queries {

diff --git a/test/e2e/multi_namespace_test.go b/test/e2e/multi_namespace_test.go
@@ -67,7 +67,7 @@ func TestMultinamespacePrometheusRule(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	RunTestQueries(t, []Query{
+	RunTestQueries(t, 10*time.Minute, []Query{
 		{
 			Query:   `ALERTS{alertname="AdditionalTestAlertRule"} == 1`,
 			ExpectN: 1,