From ce85002077e0d63a6f3dbe43bf8e81b8388a8316 Mon Sep 17 00:00:00 2001
From: Adriano Cunha <35786489+adrcunha@users.noreply.github.com>
Date: Mon, 18 Jun 2018 10:41:17 -0700
Subject: [PATCH] Reenable E2E tests, now that they are stable. (#1248)

Also disable TestContainerErrorMsg until https://github.com/knative/serving/issues/1240 is closed.
---
 test/e2e-tests.sh               | 7 +------
 test/e2e/errorcondition_test.go | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index de231e1e2490..61838b4c7d2f 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -334,13 +334,8 @@ exit_if_failed
 
 # Run the tests
 
-header "Running 'hello world' test"
-kubectl create namespace noodleburg
-go test -v -tags=e2e ./test/e2e -run HelloWorld -dockerrepo gcr.io/elafros-e2e-tests/ela-e2e-test
-exit_if_failed
-
 run_e2e_tests conformance pizzaplanet ela-conformance-test
-# run_e2e_tests e2e noodleburg ela-e2e-test
+run_e2e_tests e2e noodleburg ela-e2e-test
 
 # kubetest teardown might fail and thus incorrectly report failure of the
 # script, even if the tests pass.
diff --git a/test/e2e/errorcondition_test.go b/test/e2e/errorcondition_test.go
index 7b6a77ae93b4..051cc264983f 100644
--- a/test/e2e/errorcondition_test.go
+++ b/test/e2e/errorcondition_test.go
@@ -37,6 +37,7 @@ const (
 // https://github.com/knative/serving/blob/master/docs/spec/errors.md
 // for the container image missing scenario.
 func TestContainerErrorMsg(t *testing.T) {
+	t.Skip("Skipping until https://github.com/knative/serving/issues/1240 is closed")
 	clients := Setup(t)
 
 	// Specify an invalid image path