More output for Blue/Green test when Revision fails to come up. (knative#1948)

* BlueGreenTest to allow inactive revisions.  Print Status when fail.

* Revert to waiting for Revision to be Ready.  Added explanation.

Author: tcnghia

test/conformance/blue_green_test.go

@@ -89,7 +89,6 @@ func sendRequests(client spoof.Interface, domain string, num int) ([]string, err
 			return nil
 		})
 	}
-
 	return responses, g.Wait()
 }
 
@@ -208,14 +207,22 @@ func TestBlueGreenRoute(t *testing.T) {
 		t.Fatalf("Configuration %s was not updated with the Revision for image %s: %v", names.Config, image2, err)
 	}
 
-	// TODO(#882): Remove these?
+	// We should only need to wait until the Revision is routable,
+	// i.e. Ready or Inactive.  At that point, activator could start
+	// queuing requests until the Revision wakes up.  However, due to
+	// #882 we are currently lumping the inactive splits and that
+	// would result in 100% requests reaching Blue or Green.
+	//
+	// TODO: After we implement #1583 and honor the split percentage
+	// for inactive cases, change this wait to allow for inactive
+	// revisions as well.
 	logger.Infof("Waiting for revision %q to be ready", blue.Revision)
 	if err := test.WaitForRevisionState(clients.ServingClient, blue.Revision, test.IsRevisionReady, "RevisionIsReady"); err != nil {
-		t.Fatalf("The Revision %q was not marked as Ready: %v", blue.Revision, err)
+		t.Fatalf("The Revision %q still can't serve traffic: %v", blue.Revision, err)
 	}
 	logger.Infof("Waiting for revision %q to be ready", green.Revision)
 	if err := test.WaitForRevisionState(clients.ServingClient, green.Revision, test.IsRevisionReady, "RevisionIsReady"); err != nil {
-		t.Fatalf("The Revision %q was not marked as Ready: %v", green.Revision, err)
+		t.Fatalf("The Revision %q still can't serve traffic: %v", green.Revision, err)
 	}
 
 	// Set names for traffic targets to make them directly routable.

test/crd_checks.go

@@ -26,6 +26,7 @@ import (
 
 	pkgTest "github.com/knative/pkg/test"
 	"github.com/knative/serving/pkg/apis/serving/v1alpha1"
+	"github.com/pkg/errors"
 	"go.opencensus.io/trace"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -34,7 +35,7 @@ import (
 
 const (
 	interval = 1 * time.Second
-	timeout  = 5 * time.Minute
+	timeout  = 6 * time.Minute
 )
 
 // WaitForRouteState polls the status of the Route called name from client every
@@ -114,13 +115,24 @@ func WaitForRevisionState(client *ServingClients, name string, inState func(r *v
 	_, span := trace.StartSpan(context.Background(), metricName)
 	defer span.End()
 
-	return wait.PollImmediate(interval, timeout, func() (bool, error) {
+	waitErr := wait.PollImmediate(interval, timeout, func() (bool, error) {
 		r, err := client.Revisions.Get(name, metav1.GetOptions{})
 		if err != nil {
 			return true, err
 		}
 		return inState(r)
 	})
+	// Attempt to add revision Status to error message.
+	if waitErr != nil {
+		r, err := client.Revisions.Get(name, metav1.GetOptions{})
+		if err != nil {
+			// Cant' look for Revision, don't append Status to error message.
+			return waitErr
+		}
+		// Wrap error with information about Status.
+		return errors.Wrapf(waitErr, "Status=%#v", r.Status)
+	}
+	return nil
 }
 
 // CheckRevisionState verifies the status of the Revision called name from client