From 4c65bf9a10b412660043014dec49535903775013 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 12 Dec 2016 15:46:36 -0500 Subject: [PATCH] [integration-cli] skip plugin tests on non-x86 Due to the test plugins being architecture specific, these tests fail to start the plugin (even though they don't fail yet) Temporary fix until we can build architecture specific test plugins. Signed-off-by: Christopher Jones (cherry picked from commit ebff8c79a3b834c555f92e673c604f14fa0afa33) Signed-off-by: Victor Vieux --- .../docker_cli_authz_plugin_v2_test.go | 6 +++-- .../docker_cli_daemon_plugins_test.go | 12 +++++----- integration-cli/docker_cli_events_test.go | 2 +- integration-cli/docker_cli_inspect_test.go | 2 +- .../docker_cli_network_unix_test.go | 2 +- integration-cli/docker_cli_plugins_test.go | 22 +++++++++---------- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/integration-cli/docker_cli_authz_plugin_v2_test.go b/integration-cli/docker_cli_authz_plugin_v2_test.go index f407d8bdca..8a669fb379 100644 --- a/integration-cli/docker_cli_authz_plugin_v2_test.go +++ b/integration-cli/docker_cli_authz_plugin_v2_test.go @@ -41,7 +41,7 @@ func (s *DockerAuthzV2Suite) TearDownTest(c *check.C) { } func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) { - testRequires(c, IsAmd64) + testRequires(c, DaemonIsLinux, IsAmd64, Network) // Install authz plugin _, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag) c.Assert(err, checker.IsNil) @@ -71,7 +71,7 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) { } func (s *DockerAuthzV2Suite) TestAuthZPluginRejectVolumeRequests(c *check.C) { - testRequires(c, IsAmd64) + testRequires(c, DaemonIsLinux, IsAmd64, Network) // Install authz plugin _, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag) c.Assert(err, checker.IsNil) @@ -111,6 +111,7 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginRejectVolumeRequests(c *check.C) { } func (s *DockerAuthzV2Suite) TestAuthZPluginBadManifestFailsDaemonStart(c *check.C) { + testRequires(c, DaemonIsLinux, IsAmd64, Network) // Install authz plugin with bad manifest _, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginBadManifestName) c.Assert(err, checker.IsNil) @@ -123,6 +124,7 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginBadManifestFailsDaemonStart(c *check } func (s *DockerAuthzV2Suite) TestNonexistentAuthZPluginFailsDaemonStart(c *check.C) { + testRequires(c, DaemonIsLinux, Network) // start the daemon with a non-existent authz plugin, it will error c.Assert(s.d.Restart("--authorization-plugin="+nonexistentAuthzPluginName), check.NotNil) diff --git a/integration-cli/docker_cli_daemon_plugins_test.go b/integration-cli/docker_cli_daemon_plugins_test.go index 7ee068b37a..6061a98c8a 100644 --- a/integration-cli/docker_cli_daemon_plugins_test.go +++ b/integration-cli/docker_cli_daemon_plugins_test.go @@ -16,7 +16,7 @@ import ( // TestDaemonRestartWithPluginEnabled tests state restore for an enabled plugin func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) { - testRequires(c, Network) + testRequires(c, IsAmd64, Network) if err := s.d.Start(); err != nil { c.Fatalf("Could not start daemon: %v", err) @@ -49,7 +49,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) { // TestDaemonRestartWithPluginDisabled tests state restore for a disabled plugin func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) { - testRequires(c, Network) + testRequires(c, IsAmd64, Network) if err := s.d.Start(); err != nil { c.Fatalf("Could not start daemon: %v", err) @@ -80,7 +80,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) { // TestDaemonKillLiveRestoreWithPlugins SIGKILLs daemon started with --live-restore. // Plugins should continue to run. func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) { - testRequires(c, Network, IsAmd64) + testRequires(c, IsAmd64, Network) if err := s.d.Start("--live-restore"); err != nil { c.Fatalf("Could not start daemon: %v", err) @@ -113,7 +113,7 @@ func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) { // TestDaemonShutdownLiveRestoreWithPlugins SIGTERMs daemon started with --live-restore. // Plugins should continue to run. func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C) { - testRequires(c, Network, IsAmd64) + testRequires(c, IsAmd64, Network) if err := s.d.Start("--live-restore"); err != nil { c.Fatalf("Could not start daemon: %v", err) @@ -145,7 +145,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C) // TestDaemonShutdownWithPlugins shuts down running plugins. func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) { - testRequires(c, Network) + testRequires(c, IsAmd64, Network) if err := s.d.Start(); err != nil { c.Fatalf("Could not start daemon: %v", err) @@ -184,7 +184,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) { // TestVolumePlugin tests volume creation using a plugin. func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) { - testRequires(c, Network, IsAmd64) + testRequires(c, IsAmd64, Network) volName := "plugin-volume" destDir := "/tmp/data/" diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index f7048dd3da..1fbfc742de 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -276,7 +276,7 @@ func (s *DockerSuite) TestEventsImageLoad(c *check.C) { } func (s *DockerSuite) TestEventsPluginOps(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) since := daemonUnixTime(c) diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index 2f2a918f0f..8935995c68 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -419,7 +419,7 @@ func (s *DockerSuite) TestInspectAmpersand(c *check.C) { } func (s *DockerSuite) TestInspectPlugin(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) _, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag) c.Assert(err, checker.IsNil) diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index 82fa97a55c..829ad95d6a 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -769,7 +769,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *check.C) { } func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(c *check.C) { - testRequires(c, DaemonIsLinux, Network, IsAmd64) + testRequires(c, DaemonIsLinux, IsAmd64, Network) var ( npName = "tiborvass/test-docker-netplugin" diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index 7b9a69cb75..cfc02518e4 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -18,7 +18,7 @@ var ( ) func (s *DockerSuite) TestPluginBasicOps(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) _, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag) c.Assert(err, checker.IsNil) @@ -50,7 +50,7 @@ func (s *DockerSuite) TestPluginBasicOps(c *check.C) { } func (s *DockerSuite) TestPluginForceRemove(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag) c.Assert(err, checker.IsNil) @@ -63,7 +63,7 @@ func (s *DockerSuite) TestPluginForceRemove(c *check.C) { } func (s *DockerSuite) TestPluginActive(c *check.C) { - testRequires(c, DaemonIsLinux, Network, IsAmd64) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag) c.Assert(err, checker.IsNil) @@ -90,7 +90,7 @@ func (s *DockerSuite) TestPluginActive(c *check.C) { } func (s *DockerSuite) TestPluginInstallDisable(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", "--disable", pName) c.Assert(err, checker.IsNil) c.Assert(strings.TrimSpace(out), checker.Contains, pName) @@ -113,7 +113,7 @@ func (s *DockerSuite) TestPluginInstallDisable(c *check.C) { } func (s *DockerSuite) TestPluginInstallDisableVolumeLs(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", "--disable", pName) c.Assert(err, checker.IsNil) c.Assert(strings.TrimSpace(out), checker.Contains, pName) @@ -122,7 +122,7 @@ func (s *DockerSuite) TestPluginInstallDisableVolumeLs(c *check.C) { } func (s *DockerSuite) TestPluginSet(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _ := dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--disable", pName) c.Assert(strings.TrimSpace(out), checker.Contains, pName) @@ -136,7 +136,7 @@ func (s *DockerSuite) TestPluginSet(c *check.C) { } func (s *DockerSuite) TestPluginInstallArgs(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _ := dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--disable", pName, "DEBUG=1") c.Assert(strings.TrimSpace(out), checker.Contains, pName) @@ -145,14 +145,14 @@ func (s *DockerSuite) TestPluginInstallArgs(c *check.C) { } func (s *DockerSuite) TestPluginInstallImage(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _, err := dockerCmdWithError("plugin", "install", "redis") c.Assert(err, checker.NotNil) c.Assert(out, checker.Contains, "content is not a plugin") } func (s *DockerSuite) TestPluginEnableDisableNegative(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pName) c.Assert(err, checker.IsNil) c.Assert(strings.TrimSpace(out), checker.Contains, pName) @@ -173,7 +173,7 @@ func (s *DockerSuite) TestPluginEnableDisableNegative(c *check.C) { } func (s *DockerSuite) TestPluginCreate(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) name := "foo/bar-driver" temp, err := ioutil.TempDir("", "foo") @@ -204,7 +204,7 @@ func (s *DockerSuite) TestPluginCreate(c *check.C) { } func (s *DockerSuite) TestPluginInspect(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) _, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag) c.Assert(err, checker.IsNil)