1. docker
  2. Commit 4c65bf9a10b412660043014dec49535903775013
Browse code

[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 <tophj@linux.vnet.ibm.com>
(cherry picked from commit ebff8c79a3b834c555f92e673c604f14fa0afa33)
Signed-off-by: Victor Vieux <vieux@docker.com>

Christopher Jones authored on 2016/12/13 05:46:36
Showing 6 changed files
integration-cli/docker_cli_authz_plugin_v2_test.go
History View file @ 4c65bf9
... ... 
@@ -41,7 +41,7 @@ func (s *DockerAuthzV2Suite) TearDownTest(c *check.C) {
41 41 
 }
42 42
43 43 
 func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) {
44 
-	testRequires(c, IsAmd64)
44 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
45 45 
 	// Install authz plugin
46 46 
 	_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag)
47 47 
 	c.Assert(err, checker.IsNil)
... ... 
@@ -71,7 +71,7 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) {
71 71 
 }
72 72
73 73 
 func (s *DockerAuthzV2Suite) TestAuthZPluginRejectVolumeRequests(c *check.C) {
74 
-	testRequires(c, IsAmd64)
74 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
75 75 
 	// Install authz plugin
76 76 
 	_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag)
77 77 
 	c.Assert(err, checker.IsNil)
... ... 
@@ -111,6 +111,7 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginRejectVolumeRequests(c *check.C) {
111 111 
 }
112 112
113 113 
 func (s *DockerAuthzV2Suite) TestAuthZPluginBadManifestFailsDaemonStart(c *check.C) {
114 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
114 115 
 	// Install authz plugin with bad manifest
115 116 
 	_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginBadManifestName)
116 117 
 	c.Assert(err, checker.IsNil)
... ... 
@@ -123,6 +124,7 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginBadManifestFailsDaemonStart(c *check
123 123 
 }
124 124
125 125 
 func (s *DockerAuthzV2Suite) TestNonexistentAuthZPluginFailsDaemonStart(c *check.C) {
126 
+	testRequires(c, DaemonIsLinux, Network)
126 127 
 	// start the daemon with a non-existent authz plugin, it will error
127 128 
 	c.Assert(s.d.Restart("--authorization-plugin="+nonexistentAuthzPluginName), check.NotNil)
128 129
integration-cli/docker_cli_daemon_plugins_test.go
History View file @ 4c65bf9
... ... 
@@ -16,7 +16,7 @@ import (
16 16
17 17 
 // TestDaemonRestartWithPluginEnabled tests state restore for an enabled plugin
18 18 
 func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
19 
-	testRequires(c, Network)
19 
+	testRequires(c, IsAmd64, Network)
20 20
21 21 
 	if err := s.d.Start(); err != nil {
22 22 
 		c.Fatalf("Could not start daemon: %v", err)
... ... 
@@ -49,7 +49,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
49 49
50 50 
 // TestDaemonRestartWithPluginDisabled tests state restore for a disabled plugin
51 51 
 func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
52 
-	testRequires(c, Network)
52 
+	testRequires(c, IsAmd64, Network)
53 53
54 54 
 	if err := s.d.Start(); err != nil {
55 55 
 		c.Fatalf("Could not start daemon: %v", err)
... ... 
@@ -80,7 +80,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
80 80 
 // TestDaemonKillLiveRestoreWithPlugins SIGKILLs daemon started with --live-restore.
81 81 
 // Plugins should continue to run.
82 82 
 func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {
83 
-	testRequires(c, Network, IsAmd64)
83 
+	testRequires(c, IsAmd64, Network)
84 84
85 85 
 	if err := s.d.Start("--live-restore"); err != nil {
86 86 
 		c.Fatalf("Could not start daemon: %v", err)
... ... 
@@ -113,7 +113,7 @@ func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {
113 113 
 // TestDaemonShutdownLiveRestoreWithPlugins SIGTERMs daemon started with --live-restore.
114 114 
 // Plugins should continue to run.
115 115 
 func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C) {
116 
-	testRequires(c, Network, IsAmd64)
116 
+	testRequires(c, IsAmd64, Network)
117 117
118 118 
 	if err := s.d.Start("--live-restore"); err != nil {
119 119 
 		c.Fatalf("Could not start daemon: %v", err)
... ... 
@@ -145,7 +145,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C)
145 145
146 146 
 // TestDaemonShutdownWithPlugins shuts down running plugins.
147 147 
 func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
148 
-	testRequires(c, Network)
148 
+	testRequires(c, IsAmd64, Network)
149 149
150 150 
 	if err := s.d.Start(); err != nil {
151 151 
 		c.Fatalf("Could not start daemon: %v", err)
... ... 
@@ -184,7 +184,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
184 184
185 185 
 // TestVolumePlugin tests volume creation using a plugin.
186 186 
 func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
187 
-	testRequires(c, Network, IsAmd64)
187 
+	testRequires(c, IsAmd64, Network)
188 188
189 189 
 	volName := "plugin-volume"
190 190 
 	destDir := "/tmp/data/"
integration-cli/docker_cli_events_test.go
History View file @ 4c65bf9
... ... 
@@ -276,7 +276,7 @@ func (s *DockerSuite) TestEventsImageLoad(c *check.C) {
276 276 
 }
277 277
278 278 
 func (s *DockerSuite) TestEventsPluginOps(c *check.C) {
279 
-	testRequires(c, DaemonIsLinux, Network)
279 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
280 280
281 281 
 	since := daemonUnixTime(c)
282 282
integration-cli/docker_cli_inspect_test.go
History View file @ 4c65bf9
... ... 
@@ -419,7 +419,7 @@ func (s *DockerSuite) TestInspectAmpersand(c *check.C) {
419 419 
 }
420 420
421 421 
 func (s *DockerSuite) TestInspectPlugin(c *check.C) {
422 
-	testRequires(c, DaemonIsLinux, Network)
422 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
423 423 
 	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
424 424 
 	c.Assert(err, checker.IsNil)
425 425
integration-cli/docker_cli_network_unix_test.go
History View file @ 4c65bf9
... ... 
@@ -769,7 +769,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *check.C) {
769 769 
 }
770 770
771 771 
 func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(c *check.C) {
772 
-	testRequires(c, DaemonIsLinux, Network, IsAmd64)
772 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
773 773
774 774 
 	var (
775 775 
 		npName        = "tiborvass/test-docker-netplugin"
integration-cli/docker_cli_plugins_test.go
History View file @ 4c65bf9
... ... 
@@ -18,7 +18,7 @@ var (
18 18 
 )
19 19
20 20 
 func (s *DockerSuite) TestPluginBasicOps(c *check.C) {
21 
-	testRequires(c, DaemonIsLinux, Network)
21 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
22 22 
 	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
23 23 
 	c.Assert(err, checker.IsNil)
24 24
... ... 
@@ -50,7 +50,7 @@ func (s *DockerSuite) TestPluginBasicOps(c *check.C) {
50 50 
 }
51 51
52 52 
 func (s *DockerSuite) TestPluginForceRemove(c *check.C) {
53 
-	testRequires(c, DaemonIsLinux, Network)
53 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
54 54 
 	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
55 55 
 	c.Assert(err, checker.IsNil)
56 56
... ... 
@@ -63,7 +63,7 @@ func (s *DockerSuite) TestPluginForceRemove(c *check.C) {
63 63 
 }
64 64
65 65 
 func (s *DockerSuite) TestPluginActive(c *check.C) {
66 
-	testRequires(c, DaemonIsLinux, Network, IsAmd64)
66 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
67 67 
 	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
68 68 
 	c.Assert(err, checker.IsNil)
69 69
... ... 
@@ -90,7 +90,7 @@ func (s *DockerSuite) TestPluginActive(c *check.C) {
90 90 
 }
91 91
92 92 
 func (s *DockerSuite) TestPluginInstallDisable(c *check.C) {
93 
-	testRequires(c, DaemonIsLinux, Network)
93 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
94 94 
 	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", "--disable", pName)
95 95 
 	c.Assert(err, checker.IsNil)
96 96 
 	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
... ... 
@@ -113,7 +113,7 @@ func (s *DockerSuite) TestPluginInstallDisable(c *check.C) {
113 113 
 }
114 114
115 115 
 func (s *DockerSuite) TestPluginInstallDisableVolumeLs(c *check.C) {
116 
-	testRequires(c, DaemonIsLinux, Network)
116 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
117 117 
 	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", "--disable", pName)
118 118 
 	c.Assert(err, checker.IsNil)
119 119 
 	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
... ... 
@@ -122,7 +122,7 @@ func (s *DockerSuite) TestPluginInstallDisableVolumeLs(c *check.C) {
122 122 
 }
123 123
124 124 
 func (s *DockerSuite) TestPluginSet(c *check.C) {
125 
-	testRequires(c, DaemonIsLinux, Network)
125 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
126 126 
 	out, _ := dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--disable", pName)
127 127 
 	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
128 128
... ... 
@@ -136,7 +136,7 @@ func (s *DockerSuite) TestPluginSet(c *check.C) {
136 136 
 }
137 137
138 138 
 func (s *DockerSuite) TestPluginInstallArgs(c *check.C) {
139 
-	testRequires(c, DaemonIsLinux, Network)
139 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
140 140 
 	out, _ := dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--disable", pName, "DEBUG=1")
141 141 
 	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
142 142
... ... 
@@ -145,14 +145,14 @@ func (s *DockerSuite) TestPluginInstallArgs(c *check.C) {
145 145 
 }
146 146
147 147 
 func (s *DockerSuite) TestPluginInstallImage(c *check.C) {
148 
-	testRequires(c, DaemonIsLinux, Network)
148 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
149 149 
 	out, _, err := dockerCmdWithError("plugin", "install", "redis")
150 150 
 	c.Assert(err, checker.NotNil)
151 151 
 	c.Assert(out, checker.Contains, "content is not a plugin")
152 152 
 }
153 153
154 154 
 func (s *DockerSuite) TestPluginEnableDisableNegative(c *check.C) {
155 
-	testRequires(c, DaemonIsLinux, Network)
155 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
156 156 
 	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pName)
157 157 
 	c.Assert(err, checker.IsNil)
158 158 
 	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
... ... 
@@ -173,7 +173,7 @@ func (s *DockerSuite) TestPluginEnableDisableNegative(c *check.C) {
173 173 
 }
174 174
175 175 
 func (s *DockerSuite) TestPluginCreate(c *check.C) {
176 
-	testRequires(c, DaemonIsLinux, Network)
176 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
177 177
178 178 
 	name := "foo/bar-driver"
179 179 
 	temp, err := ioutil.TempDir("", "foo")
... ... 
@@ -204,7 +204,7 @@ func (s *DockerSuite) TestPluginCreate(c *check.C) {
204 204 
 }
205 205
206 206 
 func (s *DockerSuite) TestPluginInspect(c *check.C) {
207 
-	testRequires(c, DaemonIsLinux, Network)
207 
+	testRequires(c, DaemonIsLinux, IsAmd64, Network)
208 208 
 	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
209 209 
 	c.Assert(err, checker.IsNil)
210 210