← Back to branch summary

~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/jujud/agent/machine_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/jujud/agent/machine_test.go
261
261
        // lp:1558657
262
262
        now := time.Now()
263
263
        sInfo := status.StatusInfo{
264
 
                Status:  status.StatusIdle,
 
264
                Status:  status.Idle,
265
265
                Message: "",
266
266
                Since:   &now,
267
267
        }
337
337
        svc := s.AddTestingService(c, "test-service", charm)
338
338
        err := svc.SetExposed()
339
339
        c.Assert(err, jc.ErrorIsNil)
340
 
        units, err := juju.AddUnits(s.State, svc, 1, nil)
 
340
        units, err := juju.AddUnits(s.State, svc, svc.Name(), 1, nil)
341
341
        c.Assert(err, jc.ErrorIsNil)
342
342
 
343
343
        // It should be allocated to a machine, which should then be provisioned.
387
387
        // Add one unit to a service;
388
388
        charm := s.AddTestingCharm(c, "dummy")
389
389
        svc := s.AddTestingService(c, "test-service", charm)
390
 
        units, err := juju.AddUnits(s.State, svc, 1, nil)
 
390
        units, err := juju.AddUnits(s.State, svc, svc.Name(), 1, nil)
391
391
        c.Assert(err, jc.ErrorIsNil)
392
392
 
393
393
        m, instId := s.waitProvisioned(c, units[0])
1043
1043
                for {
1044
1044
                        stateInfo, _ := a.CurrentConfig().StateServingInfo()
1045
1045
                        srvCert, err := cert.ParseCert(stateInfo.Cert)
1046
 
                        c.Assert(err, jc.ErrorIsNil)
 
1046
                        if !c.Check(err, jc.ErrorIsNil) {
 
1047
                                break
 
1048
                        }
1047
1049
                        sanIPs := make([]string, len(srvCert.IPAddresses))
1048
1050
                        for i, ip := range srvCert.IPAddresses {
1049
1051
                                sanIPs[i] = ip.String()
1052
1054
                                close(updated)
1053
1055
                                break
1054
1056
                        }
1055
 
                        time.Sleep(10 * time.Millisecond)
 
1057
                        time.Sleep(100 * time.Millisecond)
1056
1058
                }
1057
1059
        }()
1058
1060
 
1308
1310
        instrumented := TrackModels(c, tracker, modelManifoldsDisablingMigrationMaster)
1309
1311
        s.PatchValue(&modelManifolds, instrumented)
1310
1312
 
1311
 
        targetControllerTag := names.NewModelTag(utils.MustNewUUID().String())
 
1313
        targetControllerTag := names.NewControllerTag(utils.MustNewUUID().String())
1312
1314
        _, err := st.CreateMigration(state.MigrationSpec{
1313
1315
                InitiatedBy: names.NewUserTag("admin"),
1314
1316
                TargetInfo: migration.TargetInfo{