| Index: cmd/juju/status_test.go |
| === modified file 'cmd/juju/status_test.go' |
| --- cmd/juju/status_test.go 2013-02-22 09:42:34 +0000 |
| +++ cmd/juju/status_test.go 2013-02-22 21:01:41 +0000 |
| @@ -41,7 +41,7 @@ |
| { |
| "simulate juju bootstrap by adding machine/0 to the state", |
| func(st *state.State, _ *juju.Conn, c *C) { |
| - m, err := st.AddMachine("series", state.JobManageEnviron) |
| + m, err := st.AddMachine(version.Current.Series, state.JobManageEnviron) |
| c.Assert(err, IsNil) |
| c.Assert(m.Id(), Equals, "0") |
| }, |
| @@ -59,7 +59,7 @@ |
| func(st *state.State, conn *juju.Conn, c *C) { |
| m, err := st.Machine("0") |
| c.Assert(err, IsNil) |
| - inst, err := conn.Environ.StartInstance(m.Id(), testing.InvalidStateInfo(m.Id()), testing.InvalidAPIInfo(m.Id()), nil) |
| + inst, err := testing.StartInstance(conn, m) |
| c.Assert(err, IsNil) |
| err = m.SetInstanceId(inst.Id()) |
| c.Assert(err, IsNil) |
| @@ -143,10 +143,10 @@ |
| "add three more machines for units", |
| func(st *state.State, conn *juju.Conn, c *C) { |
| for i := 1; i < 3; i++ { |
| - m, err := st.AddMachine("series", state.JobHostUnits) |
| + m, err := st.AddMachine(version.Current.Series, state.JobHostUnits) |
| c.Assert(err, IsNil) |
| c.Assert(m.Id(), Equals, strconv.Itoa(i)) |
| - inst, err := conn.Environ.StartInstance(m.Id(), testing.InvalidStateInfo(m.Id()), testing.InvalidAPIInfo(m.Id()), nil) |
| + inst, err := testing.StartInstance(conn, m) |
| c.Assert(err, IsNil) |
| err = m.SetInstanceId(inst.Id()) |
| c.Assert(err, IsNil) |
