fix(tests): allow concurrent client tests with DEIS_PROFILE

Author: mboersma

tests/bin/test-integration-ec2.sh

@@ -68,7 +68,7 @@ fi
 
 make discovery-url
 # add random characters after STACK_TAG to avoid collisions
-STACK_TAG=${STACK_TAG:-test}-$(openssl rand -hex 4)
+STACK_TAG=${STACK_TAG:-test}-$DEIS_TEST_ID
 STACK_NAME=deis-$STACK_TAG
 echo "Creating CloudFormation stack $STACK_NAME"
 $DEIS_ROOT/contrib/ec2/provision-ec2-cluster.sh $STACK_NAME

tests/bin/test-setup.sh

@@ -50,6 +50,14 @@ echo "HOST_IPADDR=$HOST_IPADDR"
 export DEV_REGISTRY=${DEV_REGISTRY?}
 echo "DEV_REGISTRY=$DEV_REGISTRY"
 
+# random 10-char (5-byte) hex string to identify a test run
+export DEIS_TEST_ID=${DEIS_TEST_ID:-$(openssl rand -hex 5)}
+echo "DEIS_TEST_ID=$DEIS_TEST_ID"
+
+# give this session a unique ~/.deis/<client>.json file
+export DEIS_PROFILE=test-$DEIS_TEST_ID
+rm -f $HOME/.deis/test-$DEIS_TEST_ID.json
+
 # bail if registry is not accessible
 if ! curl -s $DEV_REGISTRY; then
   echo "DEV_REGISTRY is not accessible, exiting..."
@@ -77,9 +85,6 @@ ssh-add -D || eval $(ssh-agent) && ssh-add -D
 ssh-add ~/.ssh/$DEIS_TEST_AUTH_KEY
 ssh-add $DEIS_TEST_SSH_KEY
 
-# clean out deis session data
-rm -rf ~/.deis
-
 # wipe out all vagrants & deis virtualboxen
 function cleanup {
     log_phase "Cleaning up"

tests/integration_test.go

@@ -5,15 +5,14 @@ package tests
 import (
 	"encoding/json"
 	"io/ioutil"
+	"os"
 	"os/user"
 	"path"
 	"testing"
 
 	"github.com/deis/deis/tests/utils"
 )
 
-const clientJsonFilePath string = ".deis/client.json"
-
 var (
 	gitCloneCmd  = "if [ ! -d {{.ExampleApp}} ] ; then git clone https://github.com/deis/{{.ExampleApp}}.git ; fi"
 	gitRemoveCmd = "git remote remove deis"
@@ -39,6 +38,11 @@ func clientTest(t *testing.T, params *utils.DeisTestConfig) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	profile := os.Getenv("DEIS_PROFILE")
+	if profile == "" {
+		profile = "client"
+	}
+	clientJsonFilePath := ".deis/" + profile + ".json"
 	data, err := ioutil.ReadFile(path.Join(user.HomeDir, clientJsonFilePath))
 	if err != nil {
 		t.Fatal(err)