Merge pull request #1969 from johanneswuerbach/database-tests

fix(tests): data containers should not be shared

Author: carmstrong

database/tests/database_test.go

@@ -17,7 +17,8 @@ func TestDatabase(t *testing.T) {
 	cli, stdout, stdoutPipe := dockercli.NewClient()
 	dockercli.RunTestEtcd(t, etcdName, etcdPort)
 	defer cli.CmdRm("-f", etcdName)
-	dockercli.RunDeisDataTest(t, "--name", "deis-database-data",
+	dataName := "deis-database-data-" + tag
+	dockercli.RunDeisDataTest(t, "--name", dataName,
 		"-v", "/var/lib/postgresql", "deis/base", "true")
 	host, port := utils.HostAddress(), utils.RandomPort()
 	fmt.Printf("--- Run deis/database:%s at %s:%s\n", tag, host, port)
@@ -32,7 +33,7 @@ func TestDatabase(t *testing.T) {
 			"-e", "EXTERNAL_PORT="+port,
 			"-e", "HOST="+host,
 			"-e", "ETCD_PORT="+etcdPort,
-			"--volumes-from", "deis-database-data",
+			"--volumes-from", dataName,
 			"deis/database:"+tag)
 	}()
 	dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-database running")

logger/tests/logger_test.go

@@ -17,7 +17,8 @@ func TestLogger(t *testing.T) {
 	cli, stdout, stdoutPipe := dockercli.NewClient()
 	dockercli.RunTestEtcd(t, etcdName, etcdPort)
 	defer cli.CmdRm("-f", etcdName)
-	dockercli.RunDeisDataTest(t, "--name", "deis-logger-data",
+	dataName := "deis-logger-data-" + tag
+	dockercli.RunDeisDataTest(t, "--name", dataName,
 		"-v", "/var/log/deis", "deis/base", "/bin/true")
 	host, port := utils.HostAddress(), utils.RandomPort()
 	fmt.Printf("--- Run deis/logger:%s at %s:%s\n", tag, host, port)
@@ -32,7 +33,7 @@ func TestLogger(t *testing.T) {
 			"-e", "EXTERNAL_PORT="+port,
 			"-e", "HOST="+host,
 			"-e", "ETCD_PORT="+etcdPort,
-			"--volumes-from", "deis-logger-data",
+			"--volumes-from", dataName,
 			"deis/logger:"+tag)
 	}()
 	dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")

registry/tests/registry_test.go

@@ -26,7 +26,8 @@ func TestRegistry(t *testing.T) {
 	defer cli.CmdRm("-f", etcdName)
 	handler := etcdutils.InitEtcd(setdir, setkeys, etcdPort)
 	etcdutils.PublishEtcd(t, handler)
-	dockercli.RunDeisDataTest(t, "--name", "deis-registry-data",
+	dataName := "deis-registry-data-" + tag
+	dockercli.RunDeisDataTest(t, "--name", dataName,
 		"-v", "/data", "deis/base", "/bin/true")
 	host, port := utils.HostAddress(), utils.RandomPort()
 	fmt.Printf("--- Run deis/registry:%s at %s:%s\n", tag, host, port)
@@ -41,7 +42,7 @@ func TestRegistry(t *testing.T) {
 			"-e", "EXTERNAL_PORT="+port,
 			"-e", "HOST="+host,
 			"-e", "ETCD_PORT="+etcdPort,
-			"--volumes-from", "deis-registry-data",
+			"--volumes-from", dataName,
 			"deis/registry:"+tag)
 	}()
 	dockercli.PrintToStdout(t, stdout, stdoutPipe, "Booting")