kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

plugins: fix some tests

Browse source 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a08ffa0e93)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Tibor Vass 2016-11-10 13:07:53 -08:00 committed by Victor Vieux
parent a275ca2093
commit 8f66c5e731
4 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
integration-cli/docker_cli_daemon_plugins_test.go
View file

@ -13,8 +13,6 @@ import (
"github.com/go-check/check" "github.com/go-check/check"
) )
var pluginName = "tiborvass/no-remove"
// TestDaemonRestartWithPluginEnabled tests state restore for an enabled plugin // TestDaemonRestartWithPluginEnabled tests state restore for an enabled plugin
func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) { func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
testRequires(c, Network) testRequires(c, Network)
@ -23,15 +21,15 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
c.Fatalf("Could not start daemon: %v", err) c.Fatalf("Could not start daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
defer func() { defer func() {
if out, err := s.d.Cmd("plugin", "disable", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
c.Fatalf("Could not disable plugin: %v %s", err, out) c.Fatalf("Could not disable plugin: %v %s", err, out)
} }
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out) c.Fatalf("Could not remove plugin: %v %s", err, out)
} }
}() }()
@ -44,7 +42,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
if err != nil { if err != nil {
c.Fatalf("Could not list plugins: %v %s", err, out) c.Fatalf("Could not list plugins: %v %s", err, out)
} }
c.Assert(out, checker.Contains, pluginName) c.Assert(out, checker.Contains, pName)
c.Assert(out, checker.Contains, "true") c.Assert(out, checker.Contains, "true")
} }
@ -56,12 +54,12 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
c.Fatalf("Could not start daemon: %v", err) c.Fatalf("Could not start daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pluginName, "--disable"); err != nil { if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName, "--disable"); err != nil {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
defer func() { defer func() {
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out) c.Fatalf("Could not remove plugin: %v %s", err, out)
} }
}() }()
@ -74,7 +72,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
if err != nil { if err != nil {
c.Fatalf("Could not list plugins: %v %s", err, out) c.Fatalf("Could not list plugins: %v %s", err, out)
} }
c.Assert(out, checker.Contains, pluginName) c.Assert(out, checker.Contains, pName)
c.Assert(out, checker.Contains, "false") c.Assert(out, checker.Contains, "false")
} }
@ -86,17 +84,17 @@ func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {
if err := s.d.Start("--live-restore"); err != nil { if err := s.d.Start("--live-restore"); err != nil {
c.Fatalf("Could not start daemon: %v", err) c.Fatalf("Could not start daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
defer func() { defer func() {
if err := s.d.Restart("--live-restore"); err != nil { if err := s.d.Restart("--live-restore"); err != nil {
c.Fatalf("Could not restart daemon: %v", err) c.Fatalf("Could not restart daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "disable", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
c.Fatalf("Could not disable plugin: %v %s", err, out) c.Fatalf("Could not disable plugin: %v %s", err, out)
} }
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out) c.Fatalf("Could not remove plugin: %v %s", err, out)
} }
}() }()
@ -105,7 +103,7 @@ func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {
c.Fatalf("Could not kill daemon: %v", err) c.Fatalf("Could not kill daemon: %v", err)
} }
cmd := exec.Command("pgrep", "-f", "plugin-no-remove") cmd := exec.Command("pgrep", "-f", pluginProcessName)
if out, ec, err := runCommandWithOutput(cmd); ec != 0 { if out, ec, err := runCommandWithOutput(cmd); ec != 0 {
c.Fatalf("Expected exit code '0', got %d err: %v output: %s ", ec, err, out) c.Fatalf("Expected exit code '0', got %d err: %v output: %s ", ec, err, out)
} }
@ -119,17 +117,17 @@ func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C)
if err := s.d.Start("--live-restore"); err != nil { if err := s.d.Start("--live-restore"); err != nil {
c.Fatalf("Could not start daemon: %v", err) c.Fatalf("Could not start daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
defer func() { defer func() {
if err := s.d.Restart("--live-restore"); err != nil { if err := s.d.Restart("--live-restore"); err != nil {
c.Fatalf("Could not restart daemon: %v", err) c.Fatalf("Could not restart daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "disable", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
c.Fatalf("Could not disable plugin: %v %s", err, out) c.Fatalf("Could not disable plugin: %v %s", err, out)
} }
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out) c.Fatalf("Could not remove plugin: %v %s", err, out)
} }
}() }()
@ -138,7 +136,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C)
c.Fatalf("Could not kill daemon: %v", err) c.Fatalf("Could not kill daemon: %v", err)
} }
cmd := exec.Command("pgrep", "-f", "plugin-no-remove") cmd := exec.Command("pgrep", "-f", pluginProcessName)
if out, ec, err := runCommandWithOutput(cmd); ec != 0 { if out, ec, err := runCommandWithOutput(cmd); ec != 0 {
c.Fatalf("Expected exit code '0', got %d err: %v output: %s ", ec, err, out) c.Fatalf("Expected exit code '0', got %d err: %v output: %s ", ec, err, out)
} }
@ -151,7 +149,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
if err := s.d.Start(); err != nil { if err := s.d.Start(); err != nil {
c.Fatalf("Could not start daemon: %v", err) c.Fatalf("Could not start daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
@ -159,10 +157,10 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
if err := s.d.Restart(); err != nil { if err := s.d.Restart(); err != nil {
c.Fatalf("Could not restart daemon: %v", err) c.Fatalf("Could not restart daemon: %v", err)
} }
if out, err := s.d.Cmd("plugin", "disable", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
c.Fatalf("Could not disable plugin: %v %s", err, out) c.Fatalf("Could not disable plugin: %v %s", err, out)
} }
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out) c.Fatalf("Could not remove plugin: %v %s", err, out)
} }
}() }()
@ -177,7 +175,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
} }
} }
cmd := exec.Command("pgrep", "-f", "plugin-no-remove") cmd := exec.Command("pgrep", "-f", pluginProcessName)
if out, ec, err := runCommandWithOutput(cmd); ec != 1 { if out, ec, err := runCommandWithOutput(cmd); ec != 1 {
c.Fatalf("Expected exit code '1', got %d err: %v output: %s ", ec, err, out) c.Fatalf("Expected exit code '1', got %d err: %v output: %s ", ec, err, out)
} }
@ -195,20 +193,20 @@ func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
if err := s.d.Start(); err != nil { if err := s.d.Start(); err != nil {
c.Fatalf("Could not start daemon: %v", err) c.Fatalf("Could not start daemon: %v", err)
} }
out, err := s.d.Cmd("plugin", "install", pluginName, "--grant-all-permissions") out, err := s.d.Cmd("plugin", "install", pName, "--grant-all-permissions")
if err != nil { if err != nil {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
defer func() { defer func() {
if out, err := s.d.Cmd("plugin", "disable", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
c.Fatalf("Could not disable plugin: %v %s", err, out) c.Fatalf("Could not disable plugin: %v %s", err, out)
} }
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil { if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out) c.Fatalf("Could not remove plugin: %v %s", err, out)
} }
}() }()
out, err = s.d.Cmd("volume", "create", "-d", pluginName, volName) out, err = s.d.Cmd("volume", "create", "-d", pName, volName)
if err != nil { if err != nil {
c.Fatalf("Could not create volume: %v %s", err, out) c.Fatalf("Could not create volume: %v %s", err, out)
} }
@ -223,7 +221,7 @@ func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
c.Fatalf("Could not list volume: %v %s", err, out) c.Fatalf("Could not list volume: %v %s", err, out)
} }
c.Assert(out, checker.Contains, volName) c.Assert(out, checker.Contains, volName)
c.Assert(out, checker.Contains, pluginName) c.Assert(out, checker.Contains, pName)
mountPoint, err := s.d.Cmd("volume", "inspect", volName, "--format", "{{.Mountpoint}}") mountPoint, err := s.d.Cmd("volume", "inspect", volName, "--format", "{{.Mountpoint}}")
if err != nil { if err != nil {

9
integration-cli/docker_cli_events_test.go
View file

@ -278,12 +278,11 @@ func (s *DockerSuite) TestEventsImageLoad(c *check.C) {
func (s *DockerSuite) TestEventsPluginOps(c *check.C) { func (s *DockerSuite) TestEventsPluginOps(c *check.C) {
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
pluginName := "tiborvass/no-remove:latest"
since := daemonUnixTime(c) since := daemonUnixTime(c)
dockerCmd(c, "plugin", "install", pluginName, "--grant-all-permissions") dockerCmd(c, "plugin", "install", pNameWithTag, "--grant-all-permissions")
dockerCmd(c, "plugin", "disable", pluginName) dockerCmd(c, "plugin", "disable", pNameWithTag)
dockerCmd(c, "plugin", "remove", pluginName) dockerCmd(c, "plugin", "remove", pNameWithTag)
out, _ := dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c)) out, _ := dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c))
events := strings.Split(out, "\n") events := strings.Split(out, "\n")
@ -292,7 +291,7 @@ func (s *DockerSuite) TestEventsPluginOps(c *check.C) {
nEvents := len(events) nEvents := len(events)
c.Assert(nEvents, checker.GreaterOrEqualThan, 4) c.Assert(nEvents, checker.GreaterOrEqualThan, 4)
pluginEvents := eventActionsByIDAndType(c, events, pluginName, "plugin") pluginEvents := eventActionsByIDAndType(c, events, pNameWithTag, "plugin")
c.Assert(pluginEvents, checker.HasLen, 4, check.Commentf("events: %v", events)) c.Assert(pluginEvents, checker.HasLen, 4, check.Commentf("events: %v", events))
c.Assert(pluginEvents[0], checker.Equals, "pull", check.Commentf(out)) c.Assert(pluginEvents[0], checker.Equals, "pull", check.Commentf(out))

2
integration-cli/docker_cli_network_unix_test.go
View file

@ -772,7 +772,7 @@ func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(c *check.C) {
testRequires(c, DaemonIsLinux, Network, IsAmd64) testRequires(c, DaemonIsLinux, Network, IsAmd64)
var ( var (
npName = "mavenugo/test-docker-netplugin" npName = "tiborvass/test-docker-netplugin"
npTag = "latest" npTag = "latest"
npNameWithTag = npName + ":" + npTag npNameWithTag = npName + ":" + npTag
) )

7
integration-cli/docker_cli_plugins_test.go
View file

@ -10,9 +10,10 @@ import (
) )
var ( var (
pName = "tiborvass/no-remove" pluginProcessName = "no-remove"
pTag = "latest" pName = "tiborvass/no-remove"
pNameWithTag = pName + ":" + pTag pTag = "latest"
pNameWithTag = pName + ":" + pTag
) )
func (s *DockerSuite) TestPluginBasicOps(c *check.C) { func (s *DockerSuite) TestPluginBasicOps(c *check.C) {