| Index: cmd/jujud/machine_test.go |
| === modified file 'cmd/jujud/machine_test.go' |
| --- cmd/jujud/machine_test.go 2014-01-31 05:38:42 +0000 |
| +++ cmd/jujud/machine_test.go 2014-02-14 05:35:52 +0000 |
| @@ -44,6 +44,7 @@ |
| "launchpad.net/juju-core/worker/deployer" |
| "launchpad.net/juju-core/worker/instancepoller" |
| "launchpad.net/juju-core/worker/machineenvironmentworker" |
| + "launchpad.net/juju-core/worker/upgrader" |
| ) |
| type MachineSuite struct { |
| @@ -404,8 +405,25 @@ |
| panic("watcher died") |
| } |
| +func (s *agentSuite) testUpgrade(c *gc.C, agent runner, tag string, currentTools *tools.Tools) { |
| + newVers := version.Current |
| + newVers.Patch++ |
| + envtesting.AssertUploadFakeToolsVersions(c, s.Conn.Environ.Storage(), newVers) |
| + err := s.State.SetEnvironAgentVersion(newVers.Number) |
| + c.Assert(err, gc.IsNil) |
| + err = runWithTimeout(agent) |
| + envtesting.CheckUpgraderReadyError(c, err, &upgrader.UpgradeReadyError{ |
| + AgentName: tag, |
| + OldTools: currentTools.Version, |
| + NewTools: newVers, |
| + DataDir: s.DataDir(), |
| + }) |
| +} |
| + |
| func (s *MachineSuite) TestUpgrade(c *gc.C) { |
| m, _, currentTools := s.primeAgent(c, state.JobManageEnviron, state.JobHostUnits) |
| + err := m.SetAgentVersion(currentTools.Version) |
| + c.Assert(err, gc.IsNil) |
| a := s.newAgent(c, m) |
| s.testUpgrade(c, a, m.Tag(), currentTools) |
| } |
