← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to worker/provisioner/provisioner_test.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/provisioner/provisioner_test.go
12
12
        "launchpad.net/juju-core/state"
13
13
        "launchpad.net/juju-core/state/api/params"
14
14
        coretesting "launchpad.net/juju-core/testing"
15
 
        "launchpad.net/juju-core/trivial"
 
15
        "launchpad.net/juju-core/utils"
16
16
        "launchpad.net/juju-core/worker/provisioner"
17
17
        "strings"
18
18
        stdtesting "testing"
31
31
 
32
32
var _ = Suite(&ProvisionerSuite{})
33
33
 
34
 
var veryShortAttempt = trivial.AttemptStrategy{
 
34
var veryShortAttempt = utils.AttemptStrategy{
35
35
        Total: 1 * time.Second,
36
36
        Delay: 80 * time.Millisecond,
37
37
}
69
69
        admindb := s.Session.DB("admin")
70
70
        err := admindb.Login("admin", testing.AdminSecret)
71
71
        if err != nil {
72
 
                err = admindb.Login("admin", trivial.PasswordHash(testing.AdminSecret))
 
72
                err = admindb.Login("admin", utils.PasswordHash(testing.AdminSecret))
73
73
        }
74
74
        c.Assert(err, IsNil)
75
75
        settings := s.Session.DB("juju").C("settings")
103
103
                                nonceParts := strings.SplitN(o.MachineNonce, ":", 2)
104
104
                                c.Assert(nonceParts, HasLen, 2)
105
105
                                c.Assert(nonceParts[0], Equals, state.MachineTag("0"))
106
 
                                c.Assert(trivial.IsValidUUIDString(nonceParts[1]), Equals, true)
 
106
                                c.Assert(utils.IsValidUUIDString(nonceParts[1]), Equals, true)
107
107
                                c.Assert(o.Secret, Equals, secret)
108
108
                                c.Assert(o.Constraints, DeepEquals, cons)
109
109
 
240
240
        // And check the machine status is set to error.
241
241
        status, info, err := m.Status()
242
242
        c.Assert(err, IsNil)
243
 
        c.Assert(status, Equals, params.MachineError)
 
243
        c.Assert(status, Equals, params.StatusError)
244
244
        c.Assert(info, Equals, brokenMsg)
245
245
 
246
246
        // Unbreak the environ config.