Merge pull request #19807 from gabemontero/relax-cakephp-count

move cakephp ext test count check to greater than zero

Author: openshift-merge-robot

test/extended/image_ecosystem/helper.go

@@ -2,6 +2,7 @@ package image_ecosystem
 
 import (
 	"fmt"
+	"regexp"
 	"strings"
 	"time"
 
@@ -54,3 +55,33 @@ func CheckPageContains(oc *exutil.CLI, endpoint, path, contents string) (bool, e
 	}
 	return success, nil
 }
+
+// CheckPageRegexp makes a http request for an example application and checks
+// that the result satisfies a given regexp; it will also return the submatch array entry
+// present at index for possible comparisons
+func CheckPageRegexp(oc *exutil.CLI, endpoint, path, regex string, index int) (bool, string, error) {
+	address, err := exutil.GetEndpointAddress(oc, endpoint)
+	if err != nil {
+		return false, "", err
+	}
+
+	response, err := exutil.FetchURL(fmt.Sprintf("http://%s/%s", address, path), 3*time.Minute)
+	if err != nil {
+		return false, "", err
+	}
+
+	val := ""
+	r, _ := regexp.Compile(regex)
+	parts := r.FindStringSubmatch(response)
+	success := len(parts) > 0
+	if !success {
+		fmt.Fprintf(g.GinkgoWriter, "CheckPageContains was looking for %s but got %s\n", regex, response)
+	} else {
+		for i, part := range parts {
+			if i == index {
+				val = part
+			}
+		}
+	}
+	return success, val, nil
+}

test/extended/image_ecosystem/s2i_php.go

@@ -2,6 +2,7 @@ package image_ecosystem
 
 import (
 	"fmt"
+	"strconv"
 	"time"
 
 	g "github.com/onsi/ginkgo"
@@ -19,7 +20,8 @@ var _ = g.Describe("[image_ecosystem][php][Slow] hot deploy for openshift php im
 		oc              = exutil.NewCLI("s2i-php", exutil.KubeConfigPath())
 		hotDeployParam  = "OPCACHE_REVALIDATE_FREQ=0"
 		modifyCommand   = []string{"sed", "-ie", `s/\$result\['c'\]/1337/`, "src/Template/Pages/home.ctp"}
-		pageCountFn     = func(count int) string { return fmt.Sprintf(`<span class="code" id="count-value">%d</span>`, count) }
+		pageRegexpCount = `<span class="code" id="count-value">([^0][0-9]*)</span>`
+		pageExactCount  = `<span class="code" id="count-value">%d</span>`
 		dcName          = "cakephp-mysql-example-1"
 		dcLabel         = exutil.ParseLabelsOrDie(fmt.Sprintf("deployment=%s", dcName))
 	)
@@ -58,23 +60,41 @@ var _ = g.Describe("[image_ecosystem][php][Slow] hot deploy for openshift php im
 				err = e2e.WaitForEndpoint(oc.KubeFramework().ClientSet, oc.Namespace(), "cakephp-mysql-example")
 				o.Expect(err).NotTo(o.HaveOccurred())
 
-				assertPageCountIs := func(i int) {
+				assertPageCountRegexp := func(priorValue string) string {
 					_, err := exutil.WaitForPods(oc.KubeClient().Core().Pods(oc.Namespace()), dcLabel, exutil.CheckPodIsRunning, 1, 4*time.Minute)
 					o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())
 
-					result, err := CheckPageContains(oc, "cakephp-mysql-example", "", pageCountFn(i))
+					result, val, err := CheckPageRegexp(oc, "cakephp-mysql-example", "", pageRegexpCount, 1)
 					o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())
 					o.ExpectWithOffset(1, result).To(o.BeTrue())
+					if len(priorValue) > 0 {
+						p, err := strconv.Atoi(priorValue)
+						o.Expect(err).NotTo(o.HaveOccurred())
+						v, err := strconv.Atoi(val)
+						g.By(fmt.Sprintf("comparing prior value %d with lastest value %d", p, v))
+						o.Expect(err).NotTo(o.HaveOccurred())
+						o.Expect(v).To(o.BeNumerically(">", p))
+					}
+					return val
 				}
 
 				g.By("checking page count")
-
-				assertPageCountIs(1)
-				assertPageCountIs(2)
+				val := assertPageCountRegexp("")
+				assertPageCountRegexp(val)
 
 				g.By("modifying the source code with hot deploy enabled")
 				err = RunInPodContainer(oc, dcLabel, modifyCommand)
 				o.Expect(err).NotTo(o.HaveOccurred())
+
+				assertPageCountIs := func(i int) {
+					_, err := exutil.WaitForPods(oc.KubeClient().Core().Pods(oc.Namespace()), dcLabel, exutil.CheckPodIsRunning, 1, 4*time.Minute)
+					o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())
+
+					result, err := CheckPageContains(oc, "cakephp-mysql-example", "", fmt.Sprintf(pageExactCount, i))
+					o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())
+					o.ExpectWithOffset(1, result).To(o.BeTrue())
+				}
+
 				g.By("checking page count after modifying the source code")
 				assertPageCountIs(1337)
 			})