rebase and refactoring

kubevirt · Aug 23, 2018 · 0912a2a · 0912a2a
1 parent bb3e0e3
commit 0912a2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/hack/build/run-functional-tests.sh b/hack/build/run-functional-tests.sh
@@ -24,7 +24,7 @@ source hack/build/common.sh
 KUBECTL=${KUBECTL:-${CDI_DIR}/cluster/.kubectl}
 KUBECONFIG=${KUBECONFIG:-${CDI_DIR}/cluster/.kubeconfig}
 KUBE_MASTER_URL=${KUBE_MASTER_URL:-""}
-CDI_NAMESPACE=${CDI_NAMESPACE:-kubesystem}
+CDI_NAMESPACE=${CDI_NAMESPACE:-kube-system}
 
 # parsetTestOpts sets 'pkgs' and test_args
 parseTestOpts "${@}"

diff --git a/pkg/importer/dataStream_test.go b/pkg/importer/dataStream_test.go
@@ -333,7 +333,7 @@ func TestCopyImage(t *testing.T) {
 	imageDir, _ := filepath.Abs(TestImagesDir)
 	localImageBase := filepath.Join("file://", imageDir)
 
-	t.Logf("Image dir '%s' '%s'", imageDir, testImagesDir)
+	t.Logf("Image dir '%s' '%s'", imageDir, TestImagesDir)
 	port := 9999
 	server, err := startHTTPServer(port, imageDir)
 	if err != nil {
@@ -606,10 +606,17 @@ func Test_randTmpName(t *testing.T) {
 	}
 }
 
+// dataStream_ginko_test.go was added while this PR was sitting
+// it has tests that execute qemu-img.  So disabling for now.
+// But I really think unit tests should not depend on a system process.
+// Not just for philosophical reasons.
+// qwmu-img aborts when doing streaming conversion when run in travis.
+/*
 func TestMain(m *testing.M) {
 	var retCode int
 	replaceQEMUOperations(NewQEMUAllErrors(), func() {
 		retCode = m.Run()
 	})
 	os.Exit(retCode)
 }
+*/