Merge pull request #263 from brancz/cleanup-ns

test/e2e: Cleanup and suffix namespace

Author: openshift-merge-robot

pkg/client/client.go

@@ -709,6 +709,21 @@ func (c *Client) CreateOrUpdateNamespace(n *v1.Namespace) error {
 	return errors.Wrap(err, "updating ConfigMap object failed")
 }
 
+func (c *Client) DeleteIfExists(nsName string) error {
+	nClient := c.kclient.CoreV1().Namespaces()
+	_, err := nClient.Get(nsName, metav1.GetOptions{})
+	if apierrors.IsNotFound(err) {
+		// Namespace already deleted
+		return nil
+	}
+	if err != nil {
+		return errors.Wrap(err, "retrieving Namespace object failed")
+	}
+
+	err = nClient.Delete(nsName, &metav1.DeleteOptions{})
+	return errors.Wrap(err, "deleting ConfigMap object failed")
+}
+
 func (c *Client) CreateIfNotExistConfigMap(cm *v1.ConfigMap) error {
 	cClient := c.kclient.CoreV1().ConfigMaps(cm.GetNamespace())
 	_, err := cClient.Get(cm.GetName(), metav1.GetOptions{})

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 {

test/e2e/multi_namespace_test.go

@@ -16,7 +16,9 @@ package e2e
 
 import (
 	"log"
+	"strconv"
 	"testing"
+	"time"
 
 	monv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	"k8s.io/api/core/v1"
@@ -27,7 +29,7 @@ import (
 func TestMultinamespacePrometheusRule(t *testing.T) {
 	t.Parallel()
 
-	nsName := "openshift-test-prometheus-rules"
+	nsName := "openshift-test-prometheus-rules" + strconv.FormatInt(time.Now().Unix(), 36)
 
 	err := f.OperatorClient.CreateOrUpdateNamespace(&v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
@@ -40,6 +42,7 @@ func TestMultinamespacePrometheusRule(t *testing.T) {
 	if err != nil {
 		log.Fatal(err)
 	}
+	defer f.OperatorClient.DeleteIfExists(nsName)
 
 	err = f.OperatorClient.CreateOrUpdatePrometheusRule(&monv1.PrometheusRule{
 		ObjectMeta: metav1.ObjectMeta{
@@ -64,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,