← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/juju/testing/conn.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-04-07 18:24:59 UTC
  • mfrom: (1.1.22)
  • Revision ID: package-import@ubuntu.com-20140407182459-1b6zvm5ygm4ki7yp
Tags: 1.18.0-0ubuntu1
https://launchpad.net/bugs/1287147
https://launchpad.net/bugs/1299588
https://launchpad.net/bugs/1301464
* New upstream release (LP: #1287147), including fixes for:
  - maas/lxc: LXC permission denied issue (LP: #1299588).
  - core: mega-watcher for machines does not include container
    addresses (LP: #1301464).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/juju/testing/conn.go
17
17
        "launchpad.net/juju-core/constraints"
18
18
        "launchpad.net/juju-core/environs"
19
19
        "launchpad.net/juju-core/environs/bootstrap"
 
20
        "launchpad.net/juju-core/environs/config"
20
21
        "launchpad.net/juju-core/environs/configstore"
21
22
        envtesting "launchpad.net/juju-core/environs/testing"
22
23
        "launchpad.net/juju-core/juju"
164
165
        return s.openAPIAs(c, machine.Tag(), password, "fake_nonce"), machine
165
166
}
166
167
 
 
168
func PreferredDefaultVersions(conf *config.Config, template version.Binary) []version.Binary {
 
169
        prefVersion := template
 
170
        prefVersion.Series = config.PreferredSeries(conf)
 
171
        defaultVersion := template
 
172
        defaultVersion.Series = testing.FakeDefaultSeries
 
173
        return []version.Binary{prefVersion, defaultVersion}
 
174
}
 
175
 
167
176
func (s *JujuConnSuite) setUpConn(c *gc.C) {
168
177
        if s.RootDir != "" {
169
178
                panic("JujuConnSuite.setUpConn without teardown")
203
212
        c.Assert(environ.Name(), gc.Equals, "dummyenv")
204
213
        s.PatchValue(&dummy.DataDir, s.DataDir())
205
214
 
206
 
        envtesting.MustUploadFakeTools(environ.Storage())
 
215
        versions := PreferredDefaultVersions(environ.Config(), version.Current)
 
216
        versions = append(versions, version.Current)
 
217
 
 
218
        // Upload tools for both preferred and fake default series
 
219
        envtesting.MustUploadFakeToolsVersions(environ.Storage(), versions...)
207
220
        c.Assert(bootstrap.Bootstrap(ctx, environ, constraints.Value{}), gc.IsNil)
208
221
 
209
222
        s.BackingState = environ.(GetStater).GetStateInAPIServer()
285
298
        ch := testing.Charms.Dir(name)
286
299
        ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
287
300
        curl := charm.MustParseURL("local:quantal/" + ident)
288
 
        repo, err := charm.InferRepository(curl, testing.Charms.Path())
 
301
        repo, err := charm.InferRepository(curl.Reference, testing.Charms.Path())
289
302
        c.Assert(err, gc.IsNil)
290
303
        sch, err := s.Conn.PutCharm(curl, repo, false)
291
304
        c.Assert(err, gc.IsNil)