← Back to branch summary

~jameinel/juju-core/api-facade-registry

« back to all changes in this revision

Viewing changes to environs/jujutest/livetests.go

  • Committer: John Arbash Meinel
  • Date: 2014-05-14 12:29:15 UTC
  • mfrom: (2715.2.15 juju-core)
  • Revision ID: john@arbash-meinel.com-20140514122915-lf70e9bkkxx9m11q
Merge trunk r2730

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/jujutest/livetests.go
208
208
        c.Check(insts[0].Id(), gc.Equals, id0)
209
209
        c.Check(insts[1], gc.IsNil)
210
210
 
211
 
        err = t.Env.StopInstances([]instance.Instance{inst})
 
211
        err = t.Env.StopInstances(inst.Id())
212
212
        c.Assert(err, gc.IsNil)
213
213
 
214
214
        // The machine may not be marked as shutting down
229
229
 
230
230
        inst1, _ := testing.AssertStartInstance(c, t.Env, "1")
231
231
        c.Assert(inst1, gc.NotNil)
232
 
        defer t.Env.StopInstances([]instance.Instance{inst1})
 
232
        defer t.Env.StopInstances(inst1.Id())
233
233
        ports, err := inst1.Ports("1")
234
234
        c.Assert(err, gc.IsNil)
235
235
        c.Assert(ports, gc.HasLen, 0)
239
239
        ports, err = inst2.Ports("2")
240
240
        c.Assert(err, gc.IsNil)
241
241
        c.Assert(ports, gc.HasLen, 0)
242
 
        defer t.Env.StopInstances([]instance.Instance{inst2})
 
242
        defer t.Env.StopInstances(inst2.Id())
243
243
 
244
244
        // Open some ports and check they're there.
245
245
        err = inst1.OpenPorts("1", []instance.Port{{"udp", 67}, {"tcp", 45}})
332
332
 
333
333
        // Create instances and check open ports on both instances.
334
334
        inst1, _ := testing.AssertStartInstance(c, t.Env, "1")
335
 
        defer t.Env.StopInstances([]instance.Instance{inst1})
 
335
        defer t.Env.StopInstances(inst1.Id())
336
336
        ports, err := t.Env.Ports()
337
337
        c.Assert(err, gc.IsNil)
338
338
        c.Assert(ports, gc.HasLen, 0)
341
341
        ports, err = t.Env.Ports()
342
342
        c.Assert(err, gc.IsNil)
343
343
        c.Assert(ports, gc.HasLen, 0)
344
 
        defer t.Env.StopInstances([]instance.Instance{inst2})
 
344
        defer t.Env.StopInstances(inst2.Id())
345
345
 
346
346
        err = t.Env.OpenPorts([]instance.Port{{"udp", 67}, {"tcp", 45}, {"tcp", 89}, {"tcp", 99}})
347
347
        c.Assert(err, gc.IsNil)
865
865
                MachineConfig: machineConfig,
866
866
        })
867
867
        if inst != nil {
868
 
                err := t.Env.StopInstances([]instance.Instance{inst})
 
868
                err := t.Env.StopInstances(inst.Id())
869
869
                c.Check(err, gc.IsNil)
870
870
        }
871
871
        c.Assert(inst, gc.IsNil)