← Back to branch summary

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

« back to all changes in this revision

Viewing changes to juju/conn_test.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/conn_test.go
12
12
        "launchpad.net/juju-core/juju/testing"
13
13
        "launchpad.net/juju-core/state"
14
14
        coretesting "launchpad.net/juju-core/testing"
15
 
        "launchpad.net/juju-core/trivial"
 
15
        "launchpad.net/juju-core/utils"
16
16
        "os"
17
17
        "path/filepath"
18
18
        stdtesting "testing"
117
117
        c.Assert(err, IsNil)
118
118
        info, _, err := env.StateInfo()
119
119
        c.Assert(err, IsNil)
120
 
        info.Password = trivial.PasswordHash("side-effect secret")
 
120
        info.Password = utils.PasswordHash("side-effect secret")
121
121
        st, err := state.Open(info, state.DefaultDialOpts())
122
122
        c.Assert(err, IsNil)
123
123
 
198
198
        // of the admin password.
199
199
        info, _, err := env.StateInfo()
200
200
        c.Assert(err, IsNil)
201
 
        info.Password = trivial.PasswordHash("nutkin")
 
201
        info.Password = utils.PasswordHash("nutkin")
202
202
        st, err := state.Open(info, state.DefaultDialOpts())
203
203
        c.Assert(err, IsNil)
204
204
        st.Close()