Skip to content

Commit

Permalink
Fix e2e
Browse files Browse the repository at this point in the history
Signed-off-by: Caroline Briaud <caroline.briaud@docker.com>
  • Loading branch information
carolinebriaud committed Oct 25, 2019
1 parent 2ec23c8 commit d20c612
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion e2e/commands_test.go
Expand Up @@ -238,7 +238,7 @@ func testDockerAppLifecycle(t *testing.T, useBindMount bool) {
cmd.Command = dockerCli.Command("app", "update", appName)
icmd.RunCmd(cmd).Assert(t, icmd.Expected{
ExitCode: 1,
Err: fmt.Sprintf("Installation %q has failed and cannot be updated, reinstall it using 'docker app run'", appName),
Err: fmt.Sprintf("Running App %q cannot be updated, please use 'docker app run' instead", appName),
})

// Install a Docker Application Package with an existing failed installation is fine
Expand Down
4 changes: 2 additions & 2 deletions e2e/images_test.go
Expand Up @@ -155,14 +155,14 @@ a-simple-app:latest simple
dockerAppImageTag("b-simple-app", "target")
icmd.RunCmd(cmd).Assert(t, icmd.Expected{
ExitCode: 1,
Err: `could not tag 'b-simple-app': no such application image`,
Err: `could not tag 'b-simple-app': no such App image`,
})

// with unexisting source tag
dockerAppImageTag("a-simple-app:not-a-tag", "target")
icmd.RunCmd(cmd).Assert(t, icmd.Expected{
ExitCode: 1,
Err: `could not tag 'a-simple-app:not-a-tag': no such application image`,
Err: `could not tag 'a-simple-app:not-a-tag': no such App image`,
})

// tag image with only names
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/credential-install-full.golden
Expand Up @@ -4,4 +4,4 @@ bar
SECRET_THREE: baz
/var/secret_three/data.txt
baz
Application "full" installed on context "default"
App "full" running on context "default"
2 changes: 1 addition & 1 deletion e2e/testdata/credential-install-mixed-credstore.golden
Expand Up @@ -4,4 +4,4 @@ secret2value
SECRET_THREE: xyzzy
/var/secret_three/data.txt
xyzzy
Application "mixed-credstore" installed on context "default"
App "mixed-credstore" running on context "default"
2 changes: 1 addition & 1 deletion e2e/testdata/credential-install-mixed-local-cred.golden
Expand Up @@ -4,4 +4,4 @@ secret2value
SECRET_THREE: xyzzy
/var/secret_three/data.txt
xyzzy
Application "mixed-local-cred" installed on context "default"
App "mixed-local-cred" running on context "default"
2 changes: 1 addition & 1 deletion internal/commands/run.go
Expand Up @@ -160,6 +160,6 @@ func runBundle(dockerCli command.Cli, bndl *bundle.Bundle, opts runOptions, ref
return err2
}

fmt.Fprintf(os.Stdout, "App %q is running on context %q\n", installationName, opts.targetContext)
fmt.Fprintf(os.Stdout, "App %q running on context %q\n", installationName, opts.targetContext)
return nil
}

0 comments on commit d20c612

Please sign in to comment.