Fix an issue in the swarm unlock-key rotate test where we were never updating the

previous generation unlock key.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 81f3e699c30fe412de0fa48dfa2885181f5d5002
Component: engine
This commit is contained in:
cyli
2016-11-10 10:39:14 -08:00
parent 4e58c5cd9f
commit 3c13ce07e7

View File

@ -977,6 +977,7 @@ func (s *DockerSwarmSuite) TestSwarmRotateUnlockKey(c *check.C) {
// Strip \n
newUnlockKey := outs[:len(outs)-1]
c.Assert(newUnlockKey, checker.Not(checker.Equals), "")
c.Assert(newUnlockKey, checker.Not(checker.Equals), unlockKey)
c.Assert(d.Restart(), checker.IsNil)
@ -1026,5 +1027,7 @@ func (s *DockerSwarmSuite) TestSwarmRotateUnlockKey(c *check.C) {
outs, err = d.Cmd("node", "ls")
c.Assert(err, checker.IsNil)
c.Assert(outs, checker.Not(checker.Contains), "Swarm is encrypted and needs to be unlocked")
unlockKey = newUnlockKey
}
}