Merge pull request #11001 from smarterclayton/debug_tests

Merged by openshift-bot

test/extended/util/framework.go

@@ -30,7 +30,6 @@ import (
 	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/util/uuid"
 	"k8s.io/kubernetes/pkg/util/wait"
-	e2e "k8s.io/kubernetes/test/e2e/framework"
 
 	buildapi "github.com/openshift/origin/pkg/build/api"
 	"github.com/openshift/origin/pkg/client"
@@ -40,8 +39,6 @@ import (
 	"github.com/openshift/origin/pkg/util/namer"
 )
 
-var TestContext e2e.TestContextType
-
 const pvPrefix = "pv-"
 
 // WaitForOpenShiftNamespaceImageStreams waits for the standard set of imagestreams to be imported

test/extended/util/test.go

@@ -1,7 +1,6 @@
 package util
 
 import (
-	rflag "flag"
 	"fmt"
 	"os"
 	"path"
@@ -34,6 +33,8 @@ var (
 	quiet          bool
 )
 
+var TestContext *e2e.TestContextType = &e2e.TestContext
+
 // init initialize the extended testing suite.
 // You can set these environment variables to configure extended tests:
 // KUBECONFIG - Path to kubeconfig containing embedded authinfo
@@ -43,6 +44,9 @@ func InitTest() {
 	// Add hooks to skip all kubernetes or origin tests
 	ginkgo.BeforeEach(checkSuiteSkips)
 
+	e2e.RegisterCommonFlags()
+	e2e.RegisterClusterFlags()
+
 	extendedOutputDir := filepath.Join(os.TempDir(), "openshift-extended-tests")
 	os.MkdirAll(extendedOutputDir, 0777)
 
@@ -73,15 +77,10 @@ func InitTest() {
 	}
 
 	quiet = os.Getenv("TEST_OUTPUT_QUIET") == "true"
-	//flag.StringVar(&TestContext.KubeConfig, clientcmd.RecommendedConfigPathFlag, KubeConfigPath(), "Path to kubeconfig containing embedded authinfo.")
 	flag.StringVar(&TestContext.OutputDir, "extended-tests-output-dir", extendedOutputDir, "Output directory for interesting/useful test data, like performance data, benchmarks, and other metrics.")
-	rflag.StringVar(&config.GinkgoConfig.FocusString, "focus", "", "DEPRECATED: use --ginkgo.focus")
 
 	// Ensure that Kube tests run privileged (like they do upstream)
 	TestContext.CreateTestingNS = createTestingNS
-
-	// Override the default Kubernetes E2E configuration
-	e2e.TestContext = TestContext
 }
 
 func ExecuteTest(t *testing.T, suite string) {