Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
wallyworld committed Aug 27, 2014
1 parent 92dcfb6 commit 35dcef2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions worker/upgrader/upgrader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func agentConfig(tag names.Tag, datadir string) agent.Config {
}
}

func (s *UpgraderSuite) makeUpgrader() *upgrader.Upgrader {
func (s *UpgraderSuite) makeUpgrader(c *gc.C) *upgrader.Upgrader {
err := s.machine.SetAgentVersion(version.Current)
c.Assert(err, gc.IsNil)
return upgrader.NewUpgrader(
Expand Down Expand Up @@ -252,7 +252,7 @@ func (s *UpgraderSuite) TestUsesAlreadyDownloadedToolsIfAvailable(c *gc.C) {
// downloaded tools without looking in environment storage.
envtesting.InstallFakeDownloadedTools(c, s.DataDir(), newVersion)

u := s.makeUpgrader()
u := s.makeUpgrader(c)
err = u.Stop()

envtesting.CheckUpgraderReadyError(c, err, &upgrader.UpgradeReadyError{
Expand Down Expand Up @@ -323,7 +323,7 @@ func (s *UpgraderSuite) TestUpgraderAllowsDowngradeToOrigVersionIfUpgradeInProgr

dummy.SetStorageDelay(coretesting.ShortWait)

u := s.makeUpgrader()
u := s.makeUpgrader(c)
err = u.Stop()
envtesting.CheckUpgraderReadyError(c, err, &upgrader.UpgradeReadyError{
AgentName: s.machine.Tag().String(),
Expand All @@ -350,7 +350,7 @@ func (s *UpgraderSuite) TestUpgraderRefusesDowngradeToOrigVersionIfUpgradeNotInP

dummy.SetStorageDelay(coretesting.ShortWait)

u := s.makeUpgrader()
u := s.makeUpgrader(c)
err = u.Stop()

// If the upgrade would have triggered, we would have gotten an
Expand Down

0 comments on commit 35dcef2

Please sign in to comment.