← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/resource/cmd/show_service_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/resource/cmd/show_service_test.go
213
213
                                                        Description: "awesome data",
214
214
                                                },
215
215
                                                Origin: charmresource.OriginUpload,
 
216
                                                Size:   15,
216
217
                                        },
217
218
                                        Username:  "Bill User",
218
219
                                        Timestamp: time.Date(2012, 12, 12, 12, 12, 12, 0, time.UTC),
219
220
                                },
220
221
                        },
 
222
                        DownloadProgress: map[string]int64{
 
223
                                "website2": 12,
 
224
                        },
221
225
                }},
222
226
        }}
223
227
        s.stubDeps.client.ReturnResources = data
254
258
                                        },
255
259
                                        Origin:   charmresource.OriginStore,
256
260
                                        Revision: 15,
 
261
                                        Size:     113,
257
262
                                },
258
263
                                Timestamp: time.Date(2012, 12, 12, 12, 12, 12, 0, time.UTC),
259
264
                        },
264
269
                                                Description: "awesome data",
265
270
                                        },
266
271
                                        Origin: charmresource.OriginUpload,
 
272
                                        Size:   9835617,
267
273
                                },
268
274
                                Username:  "Bill User",
269
275
                                Timestamp: time.Date(2012, 12, 12, 12, 12, 12, 0, time.UTC),
333
339
                                        },
334
340
                                        // note we're missing the beta resource for this unit
335
341
                                },
 
342
                                DownloadProgress: map[string]int64{
 
343
                                        "alpha":   17,
 
344
                                        "charlie": 899937,
 
345
                                },
336
346
                        },
337
347
                        {
338
348
                                Tag: names.NewUnitTag("svc/5"),
372
382
                                                Timestamp: time.Date(2012, 12, 12, 12, 12, 12, 0, time.UTC),
373
383
                                        },
374
384
                                },
 
385
                                DownloadProgress: map[string]int64{
 
386
                                        "charlie": 177331,
 
387
                                },
375
388
                        },
376
389
                },
377
390
        }}
392
405
UNIT RESOURCE REVISION         EXPECTED
393
406
5    alpha    10               15
394
407
5    beta     2012-12-12T12:12 2012-12-12T12:12
395
 
5    charlie  2011-11-11T11:11 2012-12-12T12:12
396
 
10   alpha    10               15
 
408
5    charlie  2011-11-11T11:11 2012-12-12T12:12 (fetching: 2%)
 
409
10   alpha    10               15 (fetching: 15%)
397
410
10   beta     -                2012-12-12T12:12
398
 
10   charlie  2011-11-11T11:11 2012-12-12T12:12
 
411
10   charlie  2011-11-11T11:11 2012-12-12T12:12 (fetching: 9%)
399
412
 
400
413
`[1:])
401
414
 
413
426
                                        },
414
427
                                        Origin:   charmresource.OriginStore,
415
428
                                        Revision: 15,
 
429
                                        Size:     113,
416
430
                                },
417
431
                                Timestamp: time.Date(2012, 12, 12, 12, 12, 12, 0, time.UTC),
418
432
                        },
423
437
                                                Description: "awesome data",
424
438
                                        },
425
439
                                        Origin: charmresource.OriginUpload,
 
440
                                        Size:   9835617,
426
441
                                },
427
442
                                Username:  "Bill User",
428
443
                                Timestamp: time.Date(2012, 12, 12, 12, 12, 12, 0, time.UTC),
468
483
                                        },
469
484
                                        // note we're missing the beta resource for this unit
470
485
                                },
 
486
                                DownloadProgress: map[string]int64{
 
487
                                        "charlie": 17,
 
488
                                },
471
489
                        },
472
490
                        {
473
491
                                Tag: names.NewUnitTag("svc/5"),
527
545
RESOURCE REVISION         EXPECTED
528
546
alpha    10               15
529
547
beta     -                2012-12-12T12:12
530
 
charlie  2011-11-11T11:11 2012-12-12T12:12
 
548
charlie  2011-11-11T11:11 2012-12-12T12:12 (fetching: 0%)
531
549
 
532
550
`[1:])
533
551