← 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/api/helpers_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/api/helpers_test.go
206
206
                                Resources: []api.Resource{
207
207
                                        unitRes,
208
208
                                },
 
209
                                DownloadProgress: map[string]int64{
 
210
                                        unitRes.Name: 8,
 
211
                                },
209
212
                        },
210
213
                },
211
214
        })
224
227
                                Resources: []resource.Resource{
225
228
                                        unitExpected,
226
229
                                },
 
230
                                DownloadProgress: map[string]int64{
 
231
                                        unitRes.Name: 8,
 
232
                                },
227
233
                        },
228
234
                },
229
235
        }
506
512
        c.Check(res, jc.DeepEquals, expected)
507
513
}
508
514
 
509
 
func (HelpersSuite) TestServiceResource2API(c *gc.C) {
 
515
func (HelpersSuite) TestServiceResources2API(c *gc.C) {
510
516
        res1 := resourcetesting.NewResource(c, nil, "res1", "a-service", "data").Resource
511
517
        res2 := resourcetesting.NewResource(c, nil, "res2", "a-service", "data2").Resource
512
518
 
530
536
                                        res1,
531
537
                                        res2,
532
538
                                },
533
 
                        },
534
 
                        // note: nothing for tag1
 
539
                                DownloadProgress: map[string]int64{
 
540
                                        res2.Name: 2,
 
541
                                },
 
542
                        },
 
543
                        {
 
544
                                Tag: tag1,
 
545
                        },
535
546
                },
536
547
                CharmStoreResources: []charmresource.Resource{
537
548
                        chres1,
539
550
                },
540
551
        }
541
552
 
542
 
        result := api.ServiceResources2APIResult(svcRes, []names.UnitTag{tag0, tag1})
 
553
        result := api.ServiceResources2APIResult(svcRes)
543
554
 
544
555
        apiRes1 := api.Resource2API(res1)
545
556
        apiRes2 := api.Resource2API(res2)
561
572
                                        apiRes1,
562
573
                                        apiRes2,
563
574
                                },
 
575
                                DownloadProgress: map[string]int64{
 
576
                                        res2.Name: 2,
 
577
                                },
564
578
                        },
565
579
                        {
566
580
                                // we should have a listing for every unit, even if they
575
589
                        apiChRes2,
576
590
                },
577
591
        })
578
 
 
579
592
}