WIP adjust tests

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

e2e/plugin/trust_test.go e2e/plugin/plugin_test.goe2e/plugin/trust_test.go renamed to e2e/plugin/plugin_test.go

@@ -2,26 +2,24 @@ package plugin
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/docker/cli/e2e/internal/fixtures"
 	"github.com/docker/cli/e2e/testutils"
 	"github.com/docker/cli/internal/test/environment"
-	"github.com/moby/moby/api/types/versions"
 	"gotest.tools/v3/icmd"
 	"gotest.tools/v3/skip"
 )
 
 const registryPrefix = "registry:5000"
 
-func TestInstallWithContentTrust(t *testing.T) {
-	// TODO(krissetto): remove this skip once the fix (see https://github.com/moby/moby/pull/47299) is deployed to moby versions < 25
-	skip.If(t, versions.LessThan(environment.DaemonAPIVersion(t), "1.44"))
+func TestCreatePushPull(t *testing.T) {
 	skip.If(t, environment.SkipPluginTests())
-	t.Skip("flaky")
 
-	const pluginName = registryPrefix + "/plugin-content-trust"
+	const pluginName = registryPrefix + "/my-plugin"
 
+	// TODO(thaJeztah): probably should use a config without the content trust bits.
 	dir := fixtures.SetupConfigFile(t)
 	defer dir.Remove()
 
@@ -34,39 +32,28 @@ func TestInstallWithContentTrust(t *testing.T) {
 	icmd.RunCommand("docker", "plugin", "create", pluginName, pluginDir.Path()).Assert(t, icmd.Success)
 	result := icmd.RunCmd(icmd.Command("docker", "plugin", "push", pluginName),
 		fixtures.WithConfig(dir.Path()),
-		fixtures.WithTrust,
-		fixtures.WithNotary,
 		fixtures.WithPassphrase("foo", "bar"),
 	)
 	result.Assert(t, icmd.Expected{
-		Out: "Signing and pushing trust metadata",
+		Out: fmt.Sprintf("The push refers to repository [%s]", pluginName),
 	})
 
 	icmd.RunCommand("docker", "plugin", "rm", "-f", pluginName).Assert(t, icmd.Success)
 
 	result = icmd.RunCmd(icmd.Command("docker", "plugin", "install", "--grant-all-permissions", pluginName),
 		fixtures.WithConfig(dir.Path()),
-		fixtures.WithTrust,
-		fixtures.WithNotary,
 	)
 	result.Assert(t, icmd.Expected{
 		Out: "Installed plugin " + pluginName,
 	})
 }
 
-func TestInstallWithContentTrustUntrusted(t *testing.T) {
+func TestInstall(t *testing.T) {
 	skip.If(t, environment.SkipPluginTests())
 
-	dir := fixtures.SetupConfigFile(t)
-	defer dir.Remove()
-
-	result := icmd.RunCmd(icmd.Command("docker", "plugin", "install", "--grant-all-permissions", "tiborvass/sample-volume-plugin:latest"),
-		fixtures.WithConfig(dir.Path()),
-		fixtures.WithTrust,
-		fixtures.WithNotary,
-	)
+	const pluginName = "tiborvass/sample-volume-plugin:latest"
+	result := icmd.RunCmd(icmd.Command("docker", "plugin", "install", "--grant-all-permissions", pluginName))
 	result.Assert(t, icmd.Expected{
-		ExitCode: 1,
-		Err:      "Error: remote trust data does not exist",
+		Out: "Installed plugin " + pluginName,
 	})
 }