Merge pull request #152 from psimovec/registry

Tests e2e: Automate 2 BZ tests & generalize TestArchiveContainsFiles

Author: openshift-merge-robot

test/integration/bugs_test.go

@@ -1,8 +1,8 @@
 package integration
 
 import (
+	"fmt"
 	"regexp"
-	"strings"
 	"testing"
 	"time"
 
@@ -145,49 +145,60 @@ func TestUnreachableHost(t *testing.T) {
 	t.Log(errDegraded)
 }
 
-//https://bugzilla.redhat.com/show_bug.cgi?id=1838973
-func latestArchiveContainsPodLogs(t *testing.T) {
-	logCount, err :=  latestArchiveContainsFiles(t, `^config/pod/openshift-monitoring/logs/.*\.log$`)
-	e(t, err, "Checking for log files failed")
-	t.Log(logCount, "log files found")
-	if logCount == 0 {
-		t.Error("no log files in archive")
+func genLatestArchiveCheckPattern(prettyName string,  check func(*testing.T, string, []string, *regexp.Regexp) error, pattern string) func(t *testing.T) {
+	return func(t * testing.T){
+		err := latestArchiveCheckFiles(t, prettyName, check, pattern)
+		if err!=nil{
+			t.Fatal(err)
+		}
 	}
 }
 
-//https://bugzilla.redhat.com/show_bug.cgi?id=1767719
-func latestArchiveContainsEvent(t *testing.T) {
-	logCount, err :=  latestArchiveContainsFiles(t, `^events/openshift-monitoring.json$`)
-	e(t, err, "Checking for event failed")
-	t.Log(logCount, "event files found")
-	if logCount == 0 {
-		t.Error("no event file in archive")
+func latestArchiveContainsConfigMaps(t *testing.T) {
+	configMaps, _ := clientset.CoreV1().ConfigMaps("openshift-config").List(metav1.ListOptions{})
+	if len(configMaps.Items) == 0 {
+		t.Fatal("Nothing to test: no config maps in openshift-config namespace")
 	}
-}
-
-//https://bugzilla.redhat.com/show_bug.cgi?id=1840012
-func latestArchiveFilesContainExtensions(t *testing.T) {
-	regex, err := regexp.Compile(knownFileSuffixesInsideArchiveRegex)
-	e(t, err, "failed to compile pattern")
-	archiveFiles := latestArchiveFiles(t)
-	t.Log(strings.Join(archiveFiles, "\n"))
-	if len(archiveFiles) == 0 {
-		t.Fatal("No files in archive to check")
-	}
-	for _, fileName := range archiveFiles {
-		if !regex.MatchString(fileName) {
-			t.Errorf(`file "%s" does not match pattern "%s"`, fileName, knownFileSuffixesInsideArchiveRegex)
+	for _, configMap := range configMaps.Items {
+		configMapPath := fmt.Sprintf("^config/configmaps/%s/.*$", configMap.Name)
+		err := latestArchiveCheckFiles(t, "config map", matchingFileExists, configMapPath)
+		if err != nil {
+			t.Error(err)
 		}
 	}
 }
 
-func TestCollectingAfterDegradingOperator(t *testing.T) {
+func TestArchiveContains(t *testing.T) {
+	//https://bugzilla.redhat.com/show_bug.cgi?id=1825756
+	t.Run("ConfigMaps", latestArchiveContainsConfigMaps)
+
+	//https://bugzilla.redhat.com/show_bug.cgi?id=1834677
+	t.Run("ImageRegistry",
+		genLatestArchiveCheckPattern(
+			"image registry", matchingFileExists,
+			`^config/imageregistry.json$`))
+
 	defer ChangeReportTimeInterval(t, 1)()
 	defer degradeOperatorMonitoring(t)()
 	checkPodsLogs(t, clientset, `Wrote \d+ records to disk in \d+`, true)
-	t.Run("Logs", latestArchiveContainsPodLogs)
-	t.Run("Event", latestArchiveContainsEvent)
-	t.Run("FileExtensions", latestArchiveFilesContainExtensions)
+
+	//https://bugzilla.redhat.com/show_bug.cgi?id=1838973
+	t.Run("Logs",
+		genLatestArchiveCheckPattern(
+			"log", matchingFileExists,
+			`^config/pod/openshift-monitoring/logs/.*\.log$`))
+
+	//https://bugzilla.redhat.com/show_bug.cgi?id=1767719
+	t.Run("Event",
+		genLatestArchiveCheckPattern(
+			"event", matchingFileExists,
+			`^events/openshift-monitoring.json$`))
+
+	//https://bugzilla.redhat.com/show_bug.cgi?id=1840012
+	t.Run("FileExtensions",
+		genLatestArchiveCheckPattern(
+			"extension of", allFilesMatch,
+			knownFileSuffixesInsideArchiveRegex))
 }
 
 // https://bugzilla.redhat.com/show_bug.cgi?id=1782151

test/integration/main_test.go

@@ -8,7 +8,6 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	"os"
 	"regexp"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -362,16 +361,45 @@ func latestArchiveFiles(t *testing.T) []string {
 	return strings.Split(stdout, "\n")
 }
 
-func latestArchiveContainsFiles(t *testing.T, pattern string) (int, error) {
-	insightsPod := findPod(t, clientset, "openshift-insights", "insights-operator")
-	hasLatestArchiveLogs := fmt.Sprintf(`tar tf $(ls -dtr /var/lib/insights-operator/* | tail -1)|grep -c "%s"`, pattern)
-	stdout, _, _ := ExecCmd(t, clientset, insightsPod.Name, "openshift-insights", hasLatestArchiveLogs, nil)
-	t.Log(stdout)
-	logCount, err := strconv.Atoi(strings.TrimSpace(stdout))
-	if err != nil && logCount !=0{
-		return -1, fmt.Errorf("command returned non-integer: %s", stdout)
+func allFilesMatch(t *testing.T, prettyName string, files []string, regex *regexp.Regexp) error {
+	for _, file := range files {
+		if !regex.MatchString(file) {
+			t.Errorf(`%s file "%s" does not match pattern "%s"`, prettyName, file, regex.String())
+		}
+	}
+	return nil
+}
+
+func matchingFileExists(t *testing.T, prettyName string, files []string, regex *regexp.Regexp) error {
+	count := 0
+	for _, file := range files {
+		if regex.MatchString(file){
+			count++
+		}
+	}
+
+	word := "files"
+	suffix := ""
+	if count == 1 {
+		word = "file"
+		suffix = "es"
+	}
+	t.Logf("%d %s %s match%s pattern `%s`", count, prettyName, word, suffix, regex.String())
+
+	if count != 0 {
+		return nil
+	}
+	return fmt.Errorf("did not find any (%s)file matching %s",prettyName, regex.String())
+}
+
+func latestArchiveCheckFiles(t *testing.T, prettyName string, check func(*testing.T, string, []string, *regexp.Regexp) error, pattern string) error {
+	latestFiles := latestArchiveFiles(t)
+	if len(latestFiles) == 0 {
+		t.Fatal("No files in archive to check")
 	}
-	return logCount, nil
+	regex, err := regexp.Compile(pattern)
+	e(t, err, "failed to compile pattern")
+	return check(t, prettyName,latestFiles, regex)
 }
 
 func TestMain(m *testing.M) {