From 362d082b6e67f2cd40d677b50b10fe76b3695279 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 28 Feb 2017 16:50:39 -0500 Subject: [PATCH] [multi-arch] skip more plugin tests on non-x86 Until the plugins are multi-arch plugins, or built on runtime, skip these tests like we do with the remainder of the plugin tests. Signed-off-by: Christopher Jones --- integration-cli/docker_cli_daemon_plugins_test.go | 4 ++-- integration-cli/docker_cli_plugins_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_daemon_plugins_test.go b/integration-cli/docker_cli_daemon_plugins_test.go index f03672685f..90246ef2b0 100644 --- a/integration-cli/docker_cli_daemon_plugins_test.go +++ b/integration-cli/docker_cli_daemon_plugins_test.go @@ -287,7 +287,7 @@ func existsMountpointWithPrefix(mountpointPrefix string) (bool, error) { } func (s *DockerDaemonSuite) TestPluginListFilterEnabled(c *check.C) { - testRequires(c, Network) + testRequires(c, IsAmd64, Network) s.d.Start(c) @@ -315,7 +315,7 @@ func (s *DockerDaemonSuite) TestPluginListFilterEnabled(c *check.C) { } func (s *DockerDaemonSuite) TestPluginListFilterCapability(c *check.C) { - testRequires(c, Network) + testRequires(c, IsAmd64, Network) s.d.Start(c) diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index 75d3319ba6..e32476c2c9 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -350,7 +350,7 @@ func (s *DockerTrustSuite) TestPluginUntrustedInstall(c *check.C) { } func (s *DockerSuite) TestPluginIDPrefix(c *check.C) { - testRequires(c, DaemonIsLinux, Network) + testRequires(c, DaemonIsLinux, IsAmd64, Network) _, _, err := dockerCmdWithError("plugin", "install", "--disable", "--grant-all-permissions", pNameWithTag) c.Assert(err, checker.IsNil)