Browse Source

Display nice message on context creation (message taken from Moby cli)

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 5 years ago
parent
commit
ed395a1e64
3 changed files with 8 additions and 5 deletions
  1. 1 0
      cli/cmd/context/create.go
  2. 4 3
      tests/aci-e2e/e2e-aci_test.go
  3. 3 2
      tests/ecs-e2e/e2e-ecs_test.go

+ 1 - 0
cli/cmd/context/create.go

@@ -135,6 +135,7 @@ func createDockerContext(ctx context.Context, name string, contextType string, d
 		description,
 		data,
 	)
+	fmt.Printf("Successfully created %s context %q\n", contextType, name)
 	return result
 }
 

+ 4 - 3
tests/aci-e2e/e2e-aci_test.go

@@ -124,7 +124,7 @@ func TestLoginLogout(t *testing.T) {
 	})
 }
 
-func TestContainerRun(t *testing.T) {
+func TestContainerRunVolume(t *testing.T) {
 	c := NewParallelE2eCLI(t, binDir)
 	sID, rg := setupTestResourceGroup(t, c)
 
@@ -581,8 +581,9 @@ func createResourceGroup(sID, rgName string) error {
 }
 
 func createAciContextAndUseIt(t *testing.T, c *E2eCLI, sID, rgName string) {
-	c.RunDockerCmd("context", "create", "aci", contextName, "--subscription-id", sID, "--resource-group", rgName, "--location", location)
-	res := c.RunDockerCmd("context", "use", contextName)
+	res := c.RunDockerCmd("context", "create", "aci", contextName, "--subscription-id", sID, "--resource-group", rgName, "--location", location)
+	res.Assert(t, icmd.Expected{Out: "Successfully created aci context \"" + contextName + "\""})
+	res = c.RunDockerCmd("context", "use", contextName)
 	res.Assert(t, icmd.Expected{Out: contextName})
 	res = c.RunDockerCmd("context", "ls")
 	res.Assert(t, icmd.Expected{Out: contextName + " *"})

+ 3 - 2
tests/ecs-e2e/e2e-ecs_test.go

@@ -131,7 +131,7 @@ func setupTest(t *testing.T) (*E2eCLI, string) {
 		if localTestProfile != "" {
 			region := os.Getenv("TEST_AWS_REGION")
 			assert.Check(t, region != "")
-			c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", localTestProfile, "--region", region)
+			res = c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", localTestProfile, "--region", region)
 		} else {
 			profile := contextName
 			region := os.Getenv("AWS_DEFAULT_REGION")
@@ -140,8 +140,9 @@ func setupTest(t *testing.T) (*E2eCLI, string) {
 			assert.Check(t, keyID != "")
 			assert.Check(t, secretKey != "")
 			assert.Check(t, region != "")
-			c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", profile, "--region", region, "--secret-key", secretKey, "--key-id", keyID)
+			res = c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", profile, "--region", region, "--secret-key", secretKey, "--key-id", keyID)
 		}
+		res.Assert(t, icmd.Expected{Out: "Successfully created ecs context \"" + contextName + "\""})
 		res = c.RunDockerCmd("context", "use", contextName)
 		res.Assert(t, icmd.Expected{Out: contextName})
 		res = c.RunDockerCmd("context", "ls")