← Back to branch summary

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

« back to all changes in this revision

Viewing changes to cmd/jujud/machine_test.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/jujud/machine_test.go
41
41
        c.Assert(err, IsNil)
42
42
        err = m.SetMongoPassword("machine-password")
43
43
        c.Assert(err, IsNil)
 
44
        err = m.SetPassword("machine-api-password")
 
45
        c.Assert(err, IsNil)
44
46
        conf, tools := s.agentSuite.primeAgent(c, state.MachineTag(m.Id()), "machine-password")
45
47
        conf.MachineNonce = state.BootstrapNonce
46
48
        conf.Write()
250
252
                Addrs:    []string{fmt.Sprintf("localhost:%d", port)},
251
253
                CACert:   []byte(testing.CACert),
252
254
                Tag:      m.Tag(),
253
 
                Password: "unused",
 
255
                Password: "machine-api-password",
254
256
        }
255
257
        conf.StateServerCert = []byte(testing.ServerCert)
256
258
        conf.StateServerKey = []byte(testing.ServerKey)
335
337
                                }
336
338
                        }
337
339
                        c.Logf("discarding unknown event %#v", op)
338
 
                case <-time.After(10 * time.Second):
 
340
                case <-time.After(15 * time.Second):
339
341
                        c.Fatalf("time out wating for operation")
340
342
                }
341
343
        }