Merge pull request #2750 from bacongobbler/example-dockerfile-http

re-revert "ref(tests): switch to example-dockerfile-http app"

Author: Matthew Fisher

docs/contributing/testing.rst

@@ -96,7 +96,7 @@ test-integration.sh
     >>> Preparing test environment <<<
 
     DEIS_ROOT=/Users/matt/Projects/src/github.com/deis/deis
-    DEIS_TEST_APP=example-go
+    DEIS_TEST_APP=example-dockerfile-http
     ...
     >>> Running integration suite <<<
 

tests/bin/test-setup.sh

@@ -18,7 +18,7 @@ echo "DEIS_ROOT=$DEIS_ROOT"
 export PATH=${GOPATH}/bin:$PATH
 
 # the application under test
-export DEIS_TEST_APP=${DEIS_TEST_APP:-example-go}
+export DEIS_TEST_APP=${DEIS_TEST_APP:-example-dockerfile-http}
 echo "DEIS_TEST_APP=$DEIS_TEST_APP"
 
 # SSH key name used for testing

tests/utils/itutils.go

@@ -312,6 +312,7 @@ func GetRandomApp() string {
 		"example-python-flask",
 		"example-ruby-sinatra",
 		"example-scala",
+		"example-dockerfile-http",
 	}
 	return apps[rand.Intn(len(apps))]
 }