Merge pull request docker#6238 from thaJeztah/e2e_touchups

e2e: minor cleanups in `TestPromptExitCode`

Author: thaJeztah

e2e/global/cli_test.go

@@ -145,14 +145,14 @@ func TestPromptExitCode(t *testing.T) {
 				t.Helper()
 				skip.If(t, versions.LessThan(environment.DaemonAPIVersion(t), "1.44"))
 
-				pluginDir := testutils.SetupPlugin(t, ctx)
-				t.Cleanup(pluginDir.Remove)
-
-				plugin := "registry:5000/plugin-content-trust-install:latest"
+				const plugin = "registry:5000/plugin-install-test:latest"
 
-				icmd.RunCommand("docker", "plugin", "create", plugin, pluginDir.Path()).Assert(t, icmd.Success)
+				pluginDir := testutils.SetupPlugin(t, ctx)
+				icmd.RunCommand("docker", "plugin", "create", plugin, pluginDir).Assert(t, icmd.Success)
 				icmd.RunCmd(icmd.Command("docker", "plugin", "push", plugin), defaultCmdOpts...).Assert(t, icmd.Success)
 				icmd.RunCmd(icmd.Command("docker", "plugin", "rm", "-f", plugin), defaultCmdOpts...).Assert(t, icmd.Success)
+
+				// Test prompt to grant privileges.
 				return icmd.Command("docker", "plugin", "install", plugin)
 			},
 		},
@@ -162,20 +162,22 @@ func TestPromptExitCode(t *testing.T) {
 				t.Helper()
 				skip.If(t, versions.LessThan(environment.DaemonAPIVersion(t), "1.44"))
 
-				pluginLatestDir := testutils.SetupPlugin(t, ctx)
-				t.Cleanup(pluginLatestDir.Remove)
-				pluginNextDir := testutils.SetupPlugin(t, ctx)
-				t.Cleanup(pluginNextDir.Remove)
-
-				plugin := "registry:5000/plugin-content-trust-upgrade"
+				const plugin = "registry:5000/plugin-upgrade-test"
 
-				icmd.RunCommand("docker", "plugin", "create", plugin+":latest", pluginLatestDir.Path()).Assert(t, icmd.Success)
-				icmd.RunCommand("docker", "plugin", "create", plugin+":next", pluginNextDir.Path()).Assert(t, icmd.Success)
+				pluginLatestDir := testutils.SetupPlugin(t, ctx)
+				icmd.RunCommand("docker", "plugin", "create", plugin+":latest", pluginLatestDir).Assert(t, icmd.Success)
 				icmd.RunCmd(icmd.Command("docker", "plugin", "push", plugin+":latest"), defaultCmdOpts...).Assert(t, icmd.Success)
-				icmd.RunCmd(icmd.Command("docker", "plugin", "push", plugin+":next"), defaultCmdOpts...).Assert(t, icmd.Success)
 				icmd.RunCmd(icmd.Command("docker", "plugin", "rm", "-f", plugin+":latest"), defaultCmdOpts...).Assert(t, icmd.Success)
+
+				pluginNextDir := testutils.SetupPlugin(t, ctx)
+				icmd.RunCommand("docker", "plugin", "create", plugin+":next", pluginNextDir).Assert(t, icmd.Success)
+				icmd.RunCmd(icmd.Command("docker", "plugin", "push", plugin+":next"), defaultCmdOpts...).Assert(t, icmd.Success)
 				icmd.RunCmd(icmd.Command("docker", "plugin", "rm", "-f", plugin+":next"), defaultCmdOpts...).Assert(t, icmd.Success)
+
+				// Using "--grant-all-permissions" to disable prompting for confirmation.
 				icmd.RunCmd(icmd.Command("docker", "plugin", "install", "--disable", "--grant-all-permissions", plugin+":latest"), defaultCmdOpts...).Assert(t, icmd.Success)
+
+				// Test prompting for upgrade.
 				return icmd.Command("docker", "plugin", "upgrade", plugin+":latest", plugin+":next")
 			},
 		},

e2e/plugin/trust_test.go

@@ -29,9 +29,8 @@ func TestInstallWithContentTrust(t *testing.T) {
 	t.Cleanup(cancel)
 
 	pluginDir := testutils.SetupPlugin(t, ctx)
-	t.Cleanup(pluginDir.Remove)
 
-	icmd.RunCommand("docker", "plugin", "create", pluginName, pluginDir.Path()).Assert(t, icmd.Success)
+	icmd.RunCommand("docker", "plugin", "create", pluginName, pluginDir).Assert(t, icmd.Success)
 	result := icmd.RunCmd(icmd.Command("docker", "plugin", "push", pluginName),
 		fixtures.WithConfig(dir.Path()),
 		fixtures.WithTrust,

e2e/testutils/plugins.go

@@ -22,8 +22,10 @@ import (
 var plugins embed.FS
 
 // SetupPlugin builds a plugin and creates a temporary
-// directory with the plugin's config.json and rootfs.
-func SetupPlugin(t *testing.T, ctx context.Context) *fs.Dir {
+// directory with the plugin's config.json and rootfs,
+// which will be removed in [t.Cleanup]. It returns
+// the location of the temporary directory.
+func SetupPlugin(t *testing.T, ctx context.Context) (pluginDir string) {
 	t.Helper()
 
 	p := &plugin.Config{
@@ -52,7 +54,7 @@ func SetupPlugin(t *testing.T, ctx context.Context) *fs.Dir {
 	)
 
 	icmd.RunCommand("/bin/cp", binPath, dir.Join("rootfs", p.Entrypoint[0])).Assert(t, icmd.Success)
-	return dir
+	return dir.Path()
 }
 
 // buildPlugin uses Go to build a plugin from one of the source files in the plugins directory.