Browse code
Skip plugin tests if not in amd64
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Tonis Tiigi authored on 2016/11/12 02:50:43Showing 4 changed files
- integration-cli/docker_cli_authz_plugin_v2_test.go
- integration-cli/docker_cli_daemon_plugins_test.go
- integration-cli/docker_cli_network_unix_test.go
- integration-cli/docker_cli_plugins_test.go
| ... | ... |
@@ -41,6 +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 | 45 |
// Install authz plugin |
| 45 | 46 |
_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag)
|
| 46 | 47 |
c.Assert(err, checker.IsNil) |
| ... | ... |
@@ -70,6 +71,7 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) {
|
| 70 | 70 |
} |
| 71 | 71 |
|
| 72 | 72 |
func (s *DockerAuthzV2Suite) TestAuthZPluginRejectVolumeRequests(c *check.C) {
|
| 73 |
+ testRequires(c, IsAmd64) |
|
| 73 | 74 |
// Install authz plugin |
| 74 | 75 |
_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag)
|
| 75 | 76 |
c.Assert(err, checker.IsNil) |
| ... | ... |
@@ -81,7 +81,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
|
| 81 | 81 |
// TestDaemonKillLiveRestoreWithPlugins SIGKILLs daemon started with --live-restore. |
| 82 | 82 |
// Plugins should continue to run. |
| 83 | 83 |
func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {
|
| 84 |
- testRequires(c, Network) |
|
| 84 |
+ testRequires(c, Network, IsAmd64) |
|
| 85 | 85 |
|
| 86 | 86 |
if err := s.d.Start("--live-restore"); err != nil {
|
| 87 | 87 |
c.Fatalf("Could not start daemon: %v", err)
|
| ... | ... |
@@ -114,7 +114,7 @@ func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {
|
| 114 | 114 |
// TestDaemonShutdownLiveRestoreWithPlugins SIGTERMs daemon started with --live-restore. |
| 115 | 115 |
// Plugins should continue to run. |
| 116 | 116 |
func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C) {
|
| 117 |
- testRequires(c, Network) |
|
| 117 |
+ testRequires(c, Network, IsAmd64) |
|
| 118 | 118 |
|
| 119 | 119 |
if err := s.d.Start("--live-restore"); err != nil {
|
| 120 | 120 |
c.Fatalf("Could not start daemon: %v", err)
|
| ... | ... |
@@ -185,7 +185,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
|
| 185 | 185 |
|
| 186 | 186 |
// TestVolumePlugin tests volume creation using a plugin. |
| 187 | 187 |
func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
|
| 188 |
- testRequires(c, Network) |
|
| 188 |
+ testRequires(c, Network, IsAmd64) |
|
| 189 | 189 |
|
| 190 | 190 |
volName := "plugin-volume" |
| 191 | 191 |
volRoot := "/data" |
| ... | ... |
@@ -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) |
|
| 772 |
+ testRequires(c, DaemonIsLinux, Network, IsAmd64) |
|
| 773 | 773 |
|
| 774 | 774 |
var ( |
| 775 | 775 |
npName = "mavenugo/test-docker-netplugin" |
| ... | ... |
@@ -60,7 +60,7 @@ func (s *DockerSuite) TestPluginForceRemove(c *check.C) {
|
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 | 62 |
func (s *DockerSuite) TestPluginActive(c *check.C) {
|
| 63 |
- testRequires(c, DaemonIsLinux, Network) |
|
| 63 |
+ testRequires(c, DaemonIsLinux, Network, IsAmd64) |
|
| 64 | 64 |
out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
|
| 65 | 65 |
c.Assert(err, checker.IsNil) |
| 66 | 66 |
|