juju: always connect to State.

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 74 matching lines @@
         varDir := filepath.Join(s.rootDir, environs.VarDir)
         err = os.MkdirAll(varDir, 0777)
         c.Assert(err, IsNil)
         environs.VarDir = varDir
 
         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)
-        conn, err := juju.NewConn("dummyenv")
+
+        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(environ.Bootstrap(false), IsNil)
 
-        // sanity check we've got the correct environment.
-        c.Assert(conn.Environ.Name(), Equals, "dummyenv")
-
-        c.Assert(conn.Bootstrap(false), IsNil)
+        conn, err := juju.NewConnFromName("dummyenv")
+        c.Assert(err, IsNil)
         s.Conn = conn
-        s.State, err = conn.State()
+        s.State = conn.State
         c.Assert(err, IsNil)
 }
 
 func (s *JujuConnSuite) tearDownConn(c *C) {
         dummy.Reset()
         c.Assert(s.Conn.Close(), IsNil)
         s.Conn = nil
         s.State = nil
         os.Setenv("HOME", s.oldHome)
         s.oldHome = ""
@@ skipping 21 matching lines @@
 func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm {
         ch := testing.Charms.Dir(name)
         ident := fmt.Sprintf("%s-%d", name, ch.Revision())
         curl := charm.MustParseURL("local:series/" + ident)
         bundleURL, err := url.Parse("http://bundles.example.com/" + ident)
         c.Assert(err, IsNil)
         sch, err := s.State.AddCharm(ch, curl, bundleURL, ident+"-sha256")
         c.Assert(err, IsNil)
         return sch
 }