ref(tests): default to new deis CLI

Author: mboersma

tests/bin/test-acceptance.sh

@@ -103,5 +103,4 @@ wait update1 update2 update3
 
 log_phase "Running end-to-end integration test with Python client"
 
-export DEIS_BINARY="$DEIS_ROOT/client/dist/deis"
 time make test-integration

tests/bin/test-integration-aws.sh

@@ -197,5 +197,4 @@ done
 
 log_phase "Running integration suite with Python Client"
 
-export DEIS_BINARY="$DEIS_ROOT/client/dist/deis"
 time make test-integration

tests/bin/test-integration.sh

@@ -83,5 +83,4 @@ time deisctl start platform
 
 log_phase "Running integration suite with Python Client"
 
-export DEIS_BINARY="$DEIS_ROOT/client/dist/deis"
 time make test-integration

tests/bin/test-setup.sh

@@ -14,6 +14,10 @@ log_phase "Preparing test environment"
 export DEIS_ROOT=${GOPATH?}/src/github.com/deis/deis
 echo "DEIS_ROOT=$DEIS_ROOT"
 
+# the "deis" binary CLI to use in testing
+export DEIS_BINARY=${DEIS_BINARY:-$DEIS_ROOT/client-go/deis}
+echo "DEIS_BINARY=$DEIS_BINARY"
+
 # prepend GOPATH/bin to PATH
 export PATH=${GOPATH}/bin:$PATH