From ccb54d246a47adf3f5852ad160b982e2268d669c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20H=C3=B6rl?= <hhorl@pivotal.io>
Date: Wed, 29 Nov 2017 15:14:33 +0000
Subject: [PATCH] Make `pre-commit.sh` work with the test framework

Eventually we want our framework to work nicely with just `go test`. To
get there we need to
- inject KUBE_ASSETS_DIR
- make the framework work when run multiple times in parallel (port
  collitions, expose bound ports the the subject under test, ...)

We decided to make sure our tests are run in sequence (and not in
parallel to any other thing using etcd, for that matter) by making this
explicit in the `pre-commit.sh` - for now.

As soon as we are there, we can rollback the change to the
`pre-commit.sh` end have the test framework be tested the same as
everything else.

[#153248975]
---
 bin/pre-commit.sh                      | 7 ++++++-
 pkg/framework/test/democli/cmd/root.go | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/pre-commit.sh b/bin/pre-commit.sh
index c81e9ca08..fc519568e 100755
--- a/bin/pre-commit.sh
+++ b/bin/pre-commit.sh
@@ -19,7 +19,12 @@ go vet -all ./...
 rc=$((rc || $?))
 
 echo "Running go test"
-go test -v ./...
+go list ./... | grep -vF pkg/framework/test | xargs go test -v
+rc=$((rc || $?))
+
+echo "Running test framework tests"
+./pkg/framework/test/scripts/download-binaries.sh \
+  && ./pkg/framework/test/scripts/run-tests.sh
 rc=$((rc || $?))
 
 exit $rc
diff --git a/pkg/framework/test/democli/cmd/root.go b/pkg/framework/test/democli/cmd/root.go
index bb906bce0..db95f7a8a 100644
--- a/pkg/framework/test/democli/cmd/root.go
+++ b/pkg/framework/test/democli/cmd/root.go
@@ -46,7 +46,7 @@ func Execute() {
 	}
 }
 
-func init() { 
+func init() {
 	cobra.OnInitialize(initConfig)
 
 	// Here you will define your flags and configuration settings.