← Back to branch summary

~rogpeppe/juju-core/050-juju-provisioning-service

« back to all changes in this revision

Viewing changes to environs/cloudinit/cloudinit_test.go

  • Committer: Roger Peppe
  • Date: 2012-09-07 10:11:04 UTC
  • Revision ID: roger.peppe@canonical.com-20120907101104-v09v03081ndq8en8
state: add AddAgentService; cmd/jujud: add provisioning agent setup

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/cloudinit/cloudinit_test.go
41
41
                InstanceIdAccessor: "$instance_id",
42
42
                MachineId:          0,
43
43
                ProviderType:       "ec2",
44
 
                Provisioner:        true,
45
44
                AuthorizedKeys:     "sshkey1",
46
45
                Tools:              newSimpleTools("1.2.3-linux-amd64"),
47
46
                StateServer:        true,
50
49
        {
51
50
                MachineId:      99,
52
51
                ProviderType:   "ec2",
53
 
                Provisioner:    false,
54
52
                AuthorizedKeys: "sshkey1",
55
53
                StateServer:    false,
56
54
                Tools:          newSimpleTools("1.2.3-linux-amd64"),
94
92
        t.checkPackage(c, "libzookeeper-mt2")
95
93
        t.checkScripts(c, "JUJU_MACHINE_ID=[0-9]+")
96
94
 
97
 
        if t.cfg.Provisioner {
98
 
                t.checkScripts(c, "jujud provisioning --zookeeper-servers 'localhost"+cloudinit.ZkPortSuffix+"'")
99
 
        }
100
 
 
101
95
        if t.cfg.StateServer {
102
96
                t.checkScripts(c, "jujud machine --zookeeper-servers 'localhost"+cloudinit.ZkPortSuffix+"' .* --machine-id [0-9]+")
103
97
        } else {
261
255
// checked for by NewCloudInit.
262
256
func (cloudinitSuite) TestCloudInitVerify(c *C) {
263
257
        cfg := &cloudinit.MachineConfig{
264
 
                Provisioner:        true,
265
258
                StateServer:        true,
266
259
                InstanceIdAccessor: "$instance_id",
267
260
                ProviderType:       "ec2",