Merge pull request #13137 from stevekuznetsov/skuznets/colorized

Merged by openshift-bot
openshift · Mar 1, 2017 · 1f33720 · 1f33720
2 parents 4037577 + fa07169
commit 1f33720
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/hack/lib/cleanup.sh b/hack/lib/cleanup.sh
@@ -97,6 +97,6 @@ function os::cleanup::internal::list_k8s_containers() {
 		fi
 	done
 
-	echo "${ids[*]}"
+	echo "${ids[*]:+"${ids[*]}"}"
 }
 readonly -f os::cleanup::internal::list_k8s_containers
diff --git a/test/extended/compatibility.sh b/test/extended/compatibility.sh
@@ -19,4 +19,4 @@ os::test::extended::focus "$@"
 
 
 os::log::info "Running compatibility tests"
-FOCUS="\[Compatibility\]" SKIP="${SKIP_TESTS:-}" TEST_REPORT_FILE_NAME=compatibility os::test::extended::run -- -ginkgo.v -test.timeout 2h
+FOCUS="\[Compatibility\]" SKIP="${SKIP_TESTS:-}" TEST_REPORT_FILE_NAME=compatibility os::test::extended::run -- -test.timeout 2h
diff --git a/test/extended/conformance.sh b/test/extended/conformance.sh
@@ -23,11 +23,11 @@ exitstatus=0
 
 # run parallel tests
 os::log::info "Running parallel tests N=${PARALLEL_NODES:-<default>}"
-TEST_PARALLEL="${PARALLEL_NODES:-5}" FOCUS="${pf}" SKIP="${ps}" TEST_REPORT_FILE_NAME=conformance_parallel os::test::extended::run -- -ginkgo.noColor -ginkgo.v -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
+TEST_PARALLEL="${PARALLEL_NODES:-5}" FOCUS="${pf}" SKIP="${ps}" TEST_REPORT_FILE_NAME=conformance_parallel os::test::extended::run -- -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
 
 # run tests in serial
 os::log::info "Running serial tests"
-FOCUS="${sf}" SKIP="${ss}" TEST_REPORT_FILE_NAME=conformance_serial os::test::extended::run -- -ginkgo.noColor -ginkgo.v -test.timeout 2h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
+FOCUS="${sf}" SKIP="${ss}" TEST_REPORT_FILE_NAME=conformance_serial os::test::extended::run -- -test.timeout 2h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
 
 os::test::extended::merge_junit
 

diff --git a/test/extended/core.sh b/test/extended/core.sh
@@ -24,12 +24,12 @@ exitstatus=0
 
 # run parallel tests
 os::log::info "Running parallel tests N=${PARALLEL_NODES:-<default>}"
-TEST_PARALLEL="${PARALLEL_NODES:-5}" FOCUS="${pf}" SKIP="${ps}" TEST_REPORT_FILE_NAME=core_parallel os::test::extended::run -- -ginkgo.noColor -ginkgo.v -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
+TEST_PARALLEL="${PARALLEL_NODES:-5}" FOCUS="${pf}" SKIP="${ps}" TEST_REPORT_FILE_NAME=core_parallel os::test::extended::run -- -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
 
 # run tests in serial
 os::log::info ""
 os::log::info "Running serial tests"
-FOCUS="${sf}" SKIP="${ss}" TEST_REPORT_FILE_NAME=core_serial os::test::extended::run -- -ginkgo.noColor -ginkgo.v -test.timeout 2h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
+FOCUS="${sf}" SKIP="${ss}" TEST_REPORT_FILE_NAME=core_serial os::test::extended::run -- -test.timeout 2h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
 
 os::test::extended::merge_junit
 

diff --git a/test/extended/setup.sh b/test/extended/setup.sh
@@ -205,7 +205,7 @@ function os::test::extended::run () {
 		return
 	fi
 
-	ginkgo -v "${runArgs[@]}" "$( os::util::find::built_binary extended.test )" "$@"
+	ginkgo -v -noColor "${runArgs[@]}" "$( os::util::find::built_binary extended.test )" "$@"
 }
 
 # Create a list of extended tests to be run with the given arguments
@@ -250,6 +250,9 @@ readonly -f os::test::extended::test_list
 # This works around a gap in Jenkins JUnit reporter output that double counts skipped
 # files until https://github.com/jenkinsci/junit-plugin/pull/54 is merged.
 function os::test::extended::merge_junit () {
+	if [[ -z "${JUNIT_REPORT:-}" ]]; then
+		return
+	fi
 	local output
 	output="$( mktemp )"
 	"$( os::util::find::built_binary junitmerge )" "${TEST_REPORT_DIR}"/*.xml > "${output}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ os::test::extended::focus "$@"


		os::log::info "Running compatibility tests"
		FOCUS="\[Compatibility\]" SKIP="${SKIP_TESTS:-}" TEST_REPORT_FILE_NAME=compatibility os::test::extended::run -- -ginkgo.v -test.timeout 2h
		FOCUS="\[Compatibility\]" SKIP="${SKIP_TESTS:-}" TEST_REPORT_FILE_NAME=compatibility os::test::extended::run -- -test.timeout 2h