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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/charmrevisionupdater/updater_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:
17
17
        "github.com/juju/juju/apiserver/charmrevisionupdater/testing"
18
18
        "github.com/juju/juju/apiserver/common"
19
19
        apiservertesting "github.com/juju/juju/apiserver/testing"
 
20
        "github.com/juju/juju/charmstore"
20
21
        jujutesting "github.com/juju/juju/juju/testing"
21
22
        "github.com/juju/juju/state"
22
23
)
164
165
        defer srv.Close()
165
166
 
166
167
        // Point the charm repo initializer to the testing server.
167
 
        s.PatchValue(&charmrevisionupdater.NewCharmStore, func(p charmrepo.NewCharmStoreParams) *charmrepo.CharmStore {
168
 
                p.URL = srv.URL
169
 
                return charmrepo.NewCharmStore(p)
 
168
        s.PatchValue(&charmrevisionupdater.NewCharmStoreClientConfig, func() charmstore.ClientConfig {
 
169
                var config charmstore.ClientConfig
 
170
                config.URL = srv.URL
 
171
                return config
170
172
        })
171
173
 
172
174
        result, err := s.charmrevisionupdater.UpdateLatestRevisions()