← Back to branch summary

~rogpeppe/juju-core/323-machineagent-api-client

« back to all changes in this revision

Viewing changes to state/megawatcher_internal_test.go

  • Committer: Tarmac
  • Author(s): Tim Penhey
  • Date: 2013-06-17 22:06:54 UTC
  • mfrom: (1274.3.10 instance-id)
  • Revision ID: tarmac-20130617220654-1d7y34f00629h8cv
[r=thumper] Move state.InstanceId to instance.Id

Very mechanical change, just imports, and occasional variable renames.

https://codereview.appspot.com/10325043/

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/megawatcher_internal_test.go
10
10
        . "launchpad.net/gocheck"
11
11
        "launchpad.net/juju-core/charm"
12
12
        "launchpad.net/juju-core/constraints"
 
13
        "launchpad.net/juju-core/instance"
13
14
        "launchpad.net/juju-core/state/api/params"
14
15
        "launchpad.net/juju-core/state/multiwatcher"
15
16
        "launchpad.net/juju-core/state/watcher"
64
65
        m, err := s.State.AddMachine("series", JobManageEnviron)
65
66
        c.Assert(err, IsNil)
66
67
        c.Assert(m.Tag(), Equals, "machine-0")
67
 
        err = m.SetProvisioned(InstanceId("i-"+m.Tag()), "fake_nonce")
 
68
        err = m.SetProvisioned(instance.Id("i-"+m.Tag()), "fake_nonce")
68
69
        c.Assert(err, IsNil)
69
70
        add(&params.MachineInfo{
70
71
                Id:         "0",
140
141
                        Annotations: pairs,
141
142
                })
142
143
 
143
 
                err = m.SetProvisioned(InstanceId("i-"+m.Tag()), "fake_nonce")
 
144
                err = m.SetProvisioned(instance.Id("i-"+m.Tag()), "fake_nonce")
144
145
                c.Assert(err, IsNil)
145
146
                err = m.SetStatus(params.StatusError, m.Tag())
146
147
                c.Assert(err, IsNil)