nodelaytest

Author: psimovec

test/integration/bugs_test.go

@@ -20,6 +20,18 @@ const knownFileSuffixesInsideArchiveRegex string = `(`+
 	`(\/|^)(config|id|invoker|metrics|version)` +
 `)$`
 
+//https://bugzilla.redhat.com/show_bug.cgi?id=1841057
+func TestUploadNotDelayedAfterStart(t *testing.T) {
+	time1:=logLineTime(t, `Reporting status periodically to .* every`)
+	time2:=logLineTime(t, `Successfully reported id=`)
+	delay := time2.Sub(time1)
+	allowedDelay := time.Minute
+	t.Logf("Archive upload delay was %d seconds", delay/time.Second)
+	if delay > allowedDelay && delay < time.Hour*24-allowedDelay {
+		t.Fatal("Upload after start took too much time")
+	}
+}
+
 // https://bugzilla.redhat.com/show_bug.cgi?id=1750665
 // https://bugzilla.redhat.com/show_bug.cgi?id=1753755
 func TestDefaultUploadFrequency(t *testing.T) {

test/integration/main_test.go

@@ -183,8 +183,23 @@ func deleteAllPods(t *testing.T, namespace string) {
 	t.Log(errPod)
 }
 
-func checkPodsLogs(t *testing.T, kubeClient *kubernetes.Clientset, message string, newLogsOnly ...bool) {
-	r, _ := regexp.Compile(message)
+func logLineTime(t *testing.T, pattern string) time.Time {
+	startOfLine := `\S\d{2}\d{2}\s\d{2}:\d{2}:\d{2}\.\d{6}\s*\d+\s\S+\.go:\d+]\s`
+	str := checkPodsLogs(t, clientset, startOfLine+pattern)
+	lineStart := regexp.MustCompile(startOfLine)
+	if lineStart.MatchString(str[22:]) {
+		t.Fatal("invalid logLineTime pattern, it matched more lines")
+	}
+	str = strings.Split(strings.Split(str, ".")[0], " ")[1]
+	time1, err := time.Parse("15:04:05", str)
+	e(t, err, "time parsing fail")
+	return time1
+	
+}
+
+func checkPodsLogs(t *testing.T, kubeClient *kubernetes.Clientset, message string, newLogsOnly ...bool) string {
+	r, err := regexp.Compile(message)
+	e(t, err,"Regex compilation failed")
 	newPods, err := kubeClient.CoreV1().Pods("openshift-insights").List(metav1.ListOptions{})
 	if err != nil {
 		t.Fatal(err.Error())
@@ -194,6 +209,7 @@ func checkPodsLogs(t *testing.T, kubeClient *kubernetes.Clientset, message strin
 	if len(newLogsOnly)==1 && newLogsOnly[0] {
 		logOptions = &corev1.PodLogOptions{SinceTime:&timeNow}
 	}
+	result := ""
 	for _, newPod := range newPods.Items {
 		pod, err := kubeClient.CoreV1().Pods("openshift-insights").Get(newPod.Name, metav1.GetOptions{})
 		if err != nil {
@@ -214,7 +230,7 @@ func checkPodsLogs(t *testing.T, kubeClient *kubernetes.Clientset, message strin
 			}
 			log := buf.String()
 
-			result := r.FindString(log) //strings.Contains(log, message)
+			result = r.FindString(log) //strings.Contains(log, message)
 			if result == "" {
 				t.Logf("No %s in logs\n", message)
 				t.Logf("Logs for verification: ****\n%s", log)
@@ -228,6 +244,7 @@ func checkPodsLogs(t *testing.T, kubeClient *kubernetes.Clientset, message strin
 			t.Error(errLog)
 		}
 	}
+	return result
 }
 
 func forceUpdateSecret(ns string, secretName string, secret *v1.Secret) error {