docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Add integration tests for encrypted swarm

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8b1f72ad44f03d4786cb3e881b480c94a143885f
Component: engine
This commit is contained in:
Tonis Tiigi
2016-10-24 14:44:51 -07:00
committed by Aaron Lehmann
parent 2874df7efa
commit 6a03ee3d4e
2 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/integration-cli/daemon.go
View File

@@ -463,11 +463,14 @@ func (d *Daemon) getBaseDeviceSize(c *check.C) int64 {
// Cmd will execute a docker CLI command against this Daemon.
// Example: d.Cmd("version") will run docker -H unix://path/to/unix.sock version
func (d *Daemon) Cmd(args ...string) (string, error) {
c := exec.Command(dockerBinary, d.prependHostArg(args)...)
b, err := c.CombinedOutput()
b, err := d.command(args...).CombinedOutput()
return string(b), err
}
func (d *Daemon) command(args ...string) *exec.Cmd {
return exec.Command(dockerBinary, d.prependHostArg(args)...)
}
func (d *Daemon) prependHostArg(args []string) []string {
for _, arg := range args {
if arg == "--host" || arg == "-H" {

68
components/engine/integration-cli/docker_cli_swarm_test.go
View File

@@ -3,6 +3,7 @@
package main
import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
@@ -850,3 +851,70 @@ func (s *DockerSwarmSuite) TestDNSConfigUpdate(c *check.C) {
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(out), checker.Equals, "{[1.2.3.4] [example.com] [timeout:3]}")
}
func (s *DockerSwarmSuite) TestSwarmInitLocked(c *check.C) {
d := s.AddDaemon(c, false, false)
cmd := d.command("swarm", "init", "--lock-key")
cmd.Stdin = bytes.NewBufferString("my-secret-key")
out, err := cmd.CombinedOutput()
c.Assert(err, checker.IsNil, check.Commentf("out: %v", string(out)))
c.Assert(string(out), checker.Contains, "docker swarm unlock")
info, err := d.info()
c.Assert(err, checker.IsNil)
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
c.Assert(d.Stop(), checker.IsNil)
c.Assert(d.Start(), checker.IsNil)
info, err = d.info()
c.Assert(err, checker.IsNil)
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateLocked)
cmd = d.command("swarm", "unlock")
cmd.Stdin = bytes.NewBufferString("wrong-secret-key")
out, err = cmd.CombinedOutput()
c.Assert(err, checker.NotNil, check.Commentf("out: %v", string(out)))
c.Assert(string(out), checker.Contains, "invalid key")
cmd = d.command("swarm", "unlock")
cmd.Stdin = bytes.NewBufferString("my-secret-key")
out, err = cmd.CombinedOutput()
c.Assert(err, checker.IsNil, check.Commentf("out: %v", string(out)))
info, err = d.info()
c.Assert(err, checker.IsNil)
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
}
func (s *DockerSwarmSuite) TestSwarmLeaveLocked(c *check.C) {
d := s.AddDaemon(c, false, false)
cmd := d.command("swarm", "init", "--lock-key")
cmd.Stdin = bytes.NewBufferString("foobar")
out, err := cmd.CombinedOutput()
c.Assert(err, checker.IsNil, check.Commentf("out: %v", string(out)))
c.Assert(d.Stop(), checker.IsNil)
c.Assert(d.Start(), checker.IsNil)
info, err := d.info()
c.Assert(err, checker.IsNil)
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateLocked)
outs, err := d.Cmd("swarm", "leave", "--force")
c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
info, err = d.info()
c.Assert(err, checker.IsNil)
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
outs, err = d.Cmd("swarm", "init")
c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
info, err = d.info()
c.Assert(err, checker.IsNil)
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
}