← Back to branch summary

~wallyworld/juju-core/fast-lxc-everywhere

« back to all changes in this revision

Viewing changes to cmd/juju/status_test.go

  • Committer: Andrew Wilkins
  • Date: 2014-04-22 09:23:39 UTC
  • mfrom: (2660 juju-core)
  • mto: This revision was merged to the branch mainline in revision 2666.
  • Revision ID: andrew.wilkins@canonical.com-20140422092339-f4sih3li3p0tmbkd
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/juju/status_test.go
116
116
// shortcuts for expected output.
117
117
var (
118
118
        machine0 = M{
119
 
                "agent-state": "started",
120
 
                "dns-name":    "dummyenv-0.dns",
121
 
                "instance-id": "dummyenv-0",
122
 
                "series":      "quantal",
123
 
                "hardware":    "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
119
                "agent-state":                "started",
 
120
                "dns-name":                   "dummyenv-0.dns",
 
121
                "instance-id":                "dummyenv-0",
 
122
                "series":                     "quantal",
 
123
                "hardware":                   "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
124
                "state-server-member-status": "adding-vote",
124
125
        }
125
126
        machine1 = M{
126
127
                "agent-state": "started",
239
240
                                "environment": "dummyenv",
240
241
                                "machines": M{
241
242
                                        "0": M{
242
 
                                                "instance-id": "pending",
243
 
                                                "series":      "quantal",
 
243
                                                "instance-id":                "pending",
 
244
                                                "series":                     "quantal",
 
245
                                                "state-server-member-status": "adding-vote",
244
246
                                        },
245
247
                                },
246
248
                                "services": M{},
258
260
                                "environment": "dummyenv",
259
261
                                "machines": M{
260
262
                                        "0": M{
261
 
                                                "agent-state": "pending",
262
 
                                                "dns-name":    "dummyenv-0.dns",
263
 
                                                "instance-id": "dummyenv-0",
264
 
                                                "series":      "quantal",
265
 
                                                "hardware":    "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
263
                                                "agent-state":                "pending",
 
264
                                                "dns-name":                   "dummyenv-0.dns",
 
265
                                                "instance-id":                "dummyenv-0",
 
266
                                                "series":                     "quantal",
 
267
                                                "hardware":                   "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
268
                                                "state-server-member-status": "adding-vote",
266
269
                                        },
267
270
                                },
268
271
                                "services": M{},
288
291
                                "environment": "dummyenv",
289
292
                                "machines": M{
290
293
                                        "0": M{
291
 
                                                "dns-name":      "dummyenv-0.dns",
292
 
                                                "instance-id":   "dummyenv-0",
293
 
                                                "agent-version": "1.2.3",
294
 
                                                "agent-state":   "started",
295
 
                                                "series":        "quantal",
296
 
                                                "hardware":      "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
294
                                                "dns-name":                   "dummyenv-0.dns",
 
295
                                                "instance-id":                "dummyenv-0",
 
296
                                                "agent-version":              "1.2.3",
 
297
                                                "agent-state":                "started",
 
298
                                                "series":                     "quantal",
 
299
                                                "hardware":                   "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
300
                                                "state-server-member-status": "adding-vote",
297
301
                                        },
298
302
                                },
299
303
                                "services": M{},
362
366
                                "environment": "dummyenv",
363
367
                                "machines": M{
364
368
                                        "0": M{
365
 
                                                "agent-state": "started",
366
 
                                                "dns-name":    "dummyenv-0.dns",
367
 
                                                "instance-id": "dummyenv-0",
368
 
                                                "series":      "quantal",
369
 
                                                "hardware":    "arch=amd64 cpu-cores=2 mem=8192M root-disk=8192M",
 
369
                                                "agent-state":                "started",
 
370
                                                "dns-name":                   "dummyenv-0.dns",
 
371
                                                "instance-id":                "dummyenv-0",
 
372
                                                "series":                     "quantal",
 
373
                                                "hardware":                   "arch=amd64 cpu-cores=2 mem=8192M root-disk=8192M",
 
374
                                                "state-server-member-status": "adding-vote",
370
375
                                        },
371
376
                                },
372
377
                                "services": M{},
383
388
                                "environment": "dummyenv",
384
389
                                "machines": M{
385
390
                                        "0": M{
386
 
                                                "agent-state": "started",
387
 
                                                "instance-id": "dummyenv-0",
388
 
                                                "series":      "quantal",
389
 
                                                "hardware":    "arch=amd64 cpu-cores=2 mem=8192M root-disk=8192M",
 
391
                                                "agent-state":                "started",
 
392
                                                "instance-id":                "dummyenv-0",
 
393
                                                "series":                     "quantal",
 
394
                                                "hardware":                   "arch=amd64 cpu-cores=2 mem=8192M root-disk=8192M",
 
395
                                                "state-server-member-status": "adding-vote",
390
396
                                        },
391
397
                                },
392
398
                                "services": M{},
401
407
                                "environment": "dummyenv",
402
408
                                "machines": M{
403
409
                                        "0": M{
404
 
                                                "instance-id": "pending",
405
 
                                                "series":      "quantal",
 
410
                                                "instance-id":                "pending",
 
411
                                                "series":                     "quantal",
 
412
                                                "state-server-member-status": "adding-vote",
406
413
                                        },
407
414
                                },
408
415
                                "services": M{},
416
423
                                "environment": "dummyenv",
417
424
                                "machines": M{
418
425
                                        "0": M{
419
 
                                                "instance-state": "missing",
420
 
                                                "instance-id":    "i-missing",
421
 
                                                "agent-state":    "pending",
422
 
                                                "series":         "quantal",
423
 
                                                "hardware":       "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
426
                                                "instance-state":             "missing",
 
427
                                                "instance-id":                "i-missing",
 
428
                                                "agent-state":                "pending",
 
429
                                                "series":                     "quantal",
 
430
                                                "hardware":                   "arch=amd64 cpu-cores=1 mem=1024M root-disk=8192M",
 
431
                                                "state-server-member-status": "adding-vote",
424
432
                                        },
425
433
                                },
426
434
                                "services": M{},
1908
1916
}
1909
1917
 
1910
1918
func (e scopedExpect) step(c *gc.C, ctx *context) {
1911
 
        c.Logf("expect: %s %s", e.what, strings.Join(e.scope, " "))
 
1919
        c.Logf("\nexpect: %s %s\n", e.what, strings.Join(e.scope, " "))
1912
1920
 
1913
1921
        // Now execute the command for each format.
1914
1922
        for _, format := range statusFormats {