Merge pull request #13578 from csrwng/fix_build_ext_tests

OpenShift Bot · web-flow · commit 18962de36b37 · 2017-03-29T22:39:35.000-05:00
Merged by openshift-bot
diff --git a/test/extended/util/framework.go b/test/extended/util/framework.go
@@ -390,13 +390,19 @@ func (t *BuildResult) dumpRegistryLogs() {
 	}
 
 	since := time.Now().Sub(*buildStarted)
+
+	// Changing the namespace on the derived client still changes it on the original client
+	// because the kubeFramework field is only copied by reference. Saving the original namespace
+	// here so we can restore it when done with registry logs
+	savedNamespace := t.oc.Namespace()
 	oadm := t.oc.AsAdmin().SetNamespace("default")
 	out, err := oadm.Run("logs").Args("dc/docker-registry", "--since="+since.String()).Output()
 	if err != nil {
 		fmt.Fprintf(g.GinkgoWriter, "Error during log retrieval: %+v\n", err)
 	} else {
 		fmt.Fprintf(g.GinkgoWriter, "%s\n", out)
 	}
+	t.oc.SetNamespace(savedNamespace)
 
 	fmt.Fprintf(g.GinkgoWriter, "\n\n")
 }

Original file line number	Diff line number	Diff line change
`@@ -390,13 +390,19 @@ func (t *BuildResult) dumpRegistryLogs() {`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`since := time.Now().Sub(*buildStarted)`
	`393`	`+`
	`394`	`+ // Changing the namespace on the derived client still changes it on the original client`
	`395`	`+ // because the kubeFramework field is only copied by reference. Saving the original namespace`
	`396`	`+ // here so we can restore it when done with registry logs`
	`397`	`+ savedNamespace := t.oc.Namespace()`
`393`	`398`	`oadm := t.oc.AsAdmin().SetNamespace("default")`
`394`	`399`	`out, err := oadm.Run("logs").Args("dc/docker-registry", "--since="+since.String()).Output()`
`395`	`400`	`if err != nil {`
`396`	`401`	`fmt.Fprintf(g.GinkgoWriter, "Error during log retrieval: %+v\n", err)`
`397`	`402`	`} else {`
`398`	`403`	`fmt.Fprintf(g.GinkgoWriter, "%s\n", out)`
`399`	`404`	`}`
	`405`	`+ t.oc.SetNamespace(savedNamespace)`
`400`	`406`
`401`	`407`	`fmt.Fprintf(g.GinkgoWriter, "\n\n")`
`402`	`408`	`}`