tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use test name instead of arbitrary string that needs to be different for each test 

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-08-21 18:43:55 +02:00
parent 30884ad91a
commit 7204692e3a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/aci-e2e/e2e-aci_test.go
View File

@ -126,7 +126,7 @@ func TestLoginLogout(t *testing.T) {
func TestContainerRun(t *testing.T) { func TestContainerRun(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) c := NewParallelE2eCLI(t, binDir)
sID, rg := setupTestResourceGroup(t, c, "run") sID, rg := setupTestResourceGroup(t, c)
const ( const (
testShareName = "dockertestshare" testShareName = "dockertestshare"
@ -284,7 +284,7 @@ func TestContainerRun(t *testing.T) {
func TestContainerRunAttached(t *testing.T) { func TestContainerRunAttached(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) c := NewParallelE2eCLI(t, binDir)
_, _ = setupTestResourceGroup(t, c, "runA") _, _ = setupTestResourceGroup(t, c)
// Used in subtests // Used in subtests
var ( var (
@ -390,7 +390,7 @@ func TestContainerRunAttached(t *testing.T) {
func TestCompose(t *testing.T) { func TestCompose(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) c := NewParallelE2eCLI(t, binDir)
_, _ = setupTestResourceGroup(t, c, "compose") _, _ = setupTestResourceGroup(t, c)
const ( const (
composeFile = "../composefiles/aci-demo/aci_demo_port.yaml" composeFile = "../composefiles/aci-demo/aci_demo_port.yaml"
@ -491,7 +491,7 @@ func TestCompose(t *testing.T) {
func TestRunEnvVars(t *testing.T) { func TestRunEnvVars(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) c := NewParallelE2eCLI(t, binDir)
_, _ = setupTestResourceGroup(t, c, "runEnv") _, _ = setupTestResourceGroup(t, c)
t.Run("run", func(t *testing.T) { t.Run("run", func(t *testing.T) {
cmd := c.NewDockerCmd( cmd := c.NewDockerCmd(
@ -525,9 +525,9 @@ func TestRunEnvVars(t *testing.T) {
}) })
} }
func setupTestResourceGroup(t *testing.T, c *E2eCLI, tName string) (string, string) { func setupTestResourceGroup(t *testing.T, c *E2eCLI) (string, string) {
startTime := strconv.Itoa(int(time.Now().Unix())) startTime := strconv.Itoa(int(time.Now().Unix()))
rg := "E2E-" + tName + "-" + startTime rg := "E2E-" + t.Name() + "-" + startTime
azureLogin(t, c) azureLogin(t, c)
sID := getSubscriptionID(t) sID := getSubscriptionID(t)
err := createResourceGroup(sID, rg) err := createResourceGroup(sID, rg)