← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gopkg.in/juju/charmstore.v5-unstable/internal/v5/status_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/gopkg.in/juju/charmstore.v5-unstable/internal/v5/status_test.go
25
25
        for _, id := range []*router.ResolvedURL{
26
26
                newResolvedURL("cs:~charmers/precise/wordpress-2", 2),
27
27
                newResolvedURL("cs:~charmers/precise/wordpress-3", 3),
28
 
                newResolvedURL("cs:~foo/precise/arble-9", -1),
29
 
                newResolvedURL("cs:~bar/utopic/arble-10", -1),
30
 
                newResolvedURL("cs:~charmers/bundle/oflaughs-3", 3),
31
 
                newResolvedURL("cs:~bar/bundle/oflaughs-4", -1),
 
28
                newResolvedURL("cs:~foo/precise/mysql-9", 1),
 
29
                newResolvedURL("cs:~bar/utopic/mysql-10", -1),
 
30
                newResolvedURL("cs:~charmers/bundle/wordpress-simple-3", 3),
 
31
                newResolvedURL("cs:~bar/bundle/wordpress-simple-4", -1),
32
32
        } {
33
33
                if id.URL.Series == "bundle" {
34
 
                        s.addPublicBundle(c, "wordpress-simple", id)
 
34
                        s.addPublicBundleFromRepo(c, id.URL.Name, id, false)
35
35
                } else {
36
 
                        s.addPublicCharm(c, "wordpress", id)
 
36
                        s.addPublicCharmFromRepo(c, id.URL.Name, id)
37
37
                }
38
38
        }
39
39
        now := time.Now()
84
84
                },
85
85
                "entities": {
86
86
                        Name:   "Entities in charm store",
87
 
                        Value:  "4 charms; 2 bundles; 3 promulgated",
 
87
                        Value:  "4 charms; 2 bundles; 4 promulgated",
88
88
                        Passed: true,
89
89
                },
90
90
                "base_entities": {