From dcd11761e74d777319cbf4a51c14236f52761e97 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Fri, 9 Jan 2015 13:02:29 -0500
Subject: [PATCH] Reenable Coverage and Race detection for travis and
 integration test

---
 .travis.yml              | 2 +-
 hack/test-go.sh          | 4 ++--
 hack/test-integration.sh | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15088a2bbfb7b..47c8154fdb2b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ install:
   - ./hack/build-go.sh
 
 script:
-  - KUBE_TIMEOUT='-timeout 60s' ./hack/test-go.sh
+  - KUBE_RACE="-race" KUBE_COVER="-cover -covermode=atomic" KUBE_TIMEOUT='-timeout 60s' ./hack/test-go.sh
   - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-cmd.sh
   - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-integration.sh
 
diff --git a/hack/test-go.sh b/hack/test-go.sh
index f04af50915ee8..960568b092af8 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -44,9 +44,9 @@ kube::test::find_pkgs() {
 }
 
 # -covermode=atomic becomes default with -race in Go >=1.3
-KUBE_COVER="" #${KUBE_COVER:--cover -covermode=atomic}
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 120s}
-KUBE_RACE="" #${KUBE_RACE:--race}
+KUBE_COVER=${KUBE_COVER:-} # use KUBE_COVER="-cover -covermode=atomic" for full coverage
+KUBE_RACE=${KUBE_RACE:-}   # use KUBE_RACE="-race" to enable race testing
 
 kube::test::usage() {
   kube::log::usage_from_stdin <<EOF
diff --git a/hack/test-integration.sh b/hack/test-integration.sh
index 7fe29c38783e7..395dc1a237eb6 100755
--- a/hack/test-integration.sh
+++ b/hack/test-integration.sh
@@ -39,6 +39,7 @@ kube::etcd::start
 
 kube::log::status "Running integration test cases"
 KUBE_GOFLAGS="-tags 'integration no-docker' " \
+  KUBE_RACE="-race" \
   "${KUBE_ROOT}/hack/test-go.sh" test/integration
 
 kube::log::status "Running integration test scenario"