state: add CACert to Info.

juju/testing/conn.go

 package testing
 
 import (
         "fmt"
         "io/ioutil"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/dummy"
         "launchpad.net/juju-core/juju"
@@ skipping 73 matching lines @@
 
 // Reset returns environment state to that which existed at the start of
 // the test.
 func (s *JujuConnSuite) Reset(c *C) {
         s.tearDownConn(c)
         s.setUpConn(c)
 }
 
 func (s *JujuConnSuite) StateInfo(c *C) *state.Info {
         return &state.Info{
-                Addrs:     []string{testing.MgoAddr},
-                Password:  "dummy-secret",
-                CACertPEM: []byte(testing.CACertPEM),
+                Addrs:    []string{testing.MgoAddr},
+                Password: "dummy-secret",
+                CACert:   []byte(testing.CACert),
         }
 }
 
 func (s *JujuConnSuite) setUpConn(c *C) {
         if s.RootDir != "" {
                 panic("JujuConnSuite.setUpConn without teardown")
         }
         s.RootDir = c.MkDir()
         s.oldHome = os.Getenv("HOME")
         home := filepath.Join(s.RootDir, "/home/ubuntu")
         err := os.MkdirAll(home, 0777)
         c.Assert(err, IsNil)
         os.Setenv("HOME", home)
 
         dataDir := filepath.Join(s.RootDir, "/var/lib/juju")
         err = os.MkdirAll(dataDir, 0777)
         c.Assert(err, IsNil)
 
         err = os.Mkdir(filepath.Join(home, ".juju"), 0777)
         c.Assert(err, IsNil)
 
         err = ioutil.WriteFile(filepath.Join(home, ".juju", "environments.yaml"), config, 0600)
         c.Assert(err, IsNil)
 
+        err = ioutil.WriteFile(filepath.Join(home, ".juju", "dummyenv-cert.pem"), []byte(testing.CACert), 0666)
+        c.Assert(err, IsNil)
+
+        err = ioutil.WriteFile(filepath.Join(home, ".juju", "dummyenv-private-key.pem"), []byte(testing.CAKey), 0600)
+        c.Assert(err, IsNil)
+
         environ, err := environs.NewFromName("dummyenv")
         c.Assert(err, IsNil)
         // sanity check we've got the correct environment.
         c.Assert(environ.Name(), Equals, "dummyenv")
-        c.Assert(juju.Bootstrap(environ, false, []byte(testing.CACertPEM+testing.CAKeyPEM)), IsNil)
+        c.Assert(environs.Bootstrap(environ, false, []byte(testing.CACert+testing.CAKey)), IsNil)
 
         conn, err := juju.NewConnFromName("dummyenv")
         c.Assert(err, IsNil)
         s.Conn = conn
         s.State = conn.State
         c.Assert(err, IsNil)
 }
 
 func (s *JujuConnSuite) tearDownConn(c *C) {
         // Bootstrap will set the admin password, and render non-authorized use
@@ skipping 35 matching lines @@
 func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm {
         ch := testing.Charms.Dir("series", name)
         ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
         curl := charm.MustParseURL("local:series/" + ident)
         repo, err := charm.InferRepository(curl, testing.Charms.Path)
         c.Assert(err, IsNil)
         sch, err := s.Conn.PutCharm(curl, repo, false)
         c.Assert(err, IsNil)
         return sch
 }