← Back to branch summary

~dave-cheney/juju-core/057-environs-config-default-series-tests

« back to all changes in this revision

Viewing changes to environs/jujutest/livetests.go

state: add CACert to Info.

We will need to know the CA certificate when connecting to the state.

We don't make it mandatory when connecting to the state yet, because
that requires quite a few more changes, and this is a reasonable stepping
stone along the way.

R=john.meinel, niemeyer
CC=
https://codereview.appspot.com/6855054

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/jujutest/livetests.go
77
77
        if t.bootstrapped {
78
78
                return
79
79
        }
80
 
        err := environs.Bootstrap(t.Env, true, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
 
80
        err := environs.Bootstrap(t.Env, true, []byte(coretesting.CACert+coretesting.CAKey))
81
81
        c.Assert(err, IsNil)
82
82
        t.bootstrapped = true
83
83
}
293
293
func (t *LiveTests) TestBootstrapMultiple(c *C) {
294
294
        t.BootstrapOnce(c)
295
295
 
296
 
        err := environs.Bootstrap(t.Env, false, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
 
296
        err := environs.Bootstrap(t.Env, false, []byte(coretesting.CACert+coretesting.CAKey))
297
297
        c.Assert(err, ErrorMatches, "environment is already bootstrapped")
298
298
 
299
299
        c.Logf("destroy env")