← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/state/api/upgrader/upgrader_test.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-28 08:58:42 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20140328085842-cyzrgc120bdfxwj0
Tags: 1.17.7-0ubuntu1
https://launchpad.net/bugs/1294776
https://launchpad.net/bugs/1297077
* New upstream point release, including fixes for:
  - no debug log with all providers on Ubuntu 14.04 (LP: #1294776).
* d/control: Add cpu-checker dependency to juju-local (LP: #1297077).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/state/api/upgrader/upgrader_test.go
19
19
        statetesting "launchpad.net/juju-core/state/testing"
20
20
        coretesting "launchpad.net/juju-core/testing"
21
21
        "launchpad.net/juju-core/tools"
 
22
        "launchpad.net/juju-core/utils"
22
23
        "launchpad.net/juju-core/version"
23
24
)
24
25
 
101
102
        s.rawMachine.SetAgentVersion(cur)
102
103
        // Upgrader.Tools returns the *desired* set of tools, not the currently
103
104
        // running set. We want to be upgraded to cur.Version
104
 
        stateTools, disableSSLHostnameVerification, err := s.st.Tools(s.rawMachine.Tag())
 
105
        stateTools, hostnameVerification, err := s.st.Tools(s.rawMachine.Tag())
105
106
        c.Assert(err, gc.IsNil)
106
107
        c.Assert(stateTools.Version, gc.Equals, cur)
107
108
        c.Assert(stateTools.URL, gc.Not(gc.Equals), "")
108
 
        c.Assert(disableSSLHostnameVerification, jc.IsFalse)
 
109
        c.Assert(hostnameVerification, gc.Equals, utils.VerifySSLHostnames)
109
110
 
110
111
        envtesting.SetSSLHostnameVerification(c, s.State, false)
111
112
 
112
 
        stateTools, disableSSLHostnameVerification, err = s.st.Tools(s.rawMachine.Tag())
 
113
        stateTools, hostnameVerification, err = s.st.Tools(s.rawMachine.Tag())
113
114
        c.Assert(err, gc.IsNil)
114
115
        c.Assert(stateTools.Version, gc.Equals, cur)
115
116
        c.Assert(stateTools.URL, gc.Not(gc.Equals), "")
116
 
        c.Assert(disableSSLHostnameVerification, jc.IsTrue)
 
117
        c.Assert(hostnameVerification, gc.Equals, utils.NoVerifySSLHostnames)
117
118
}
118
119
 
119
120
func (s *machineUpgraderSuite) TestWatchAPIVersion(c *gc.C) {