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 81 matching lines @@
 
         err = ioutil.WriteFile(filepath.Join(home, ".juju", "environments.yaml"), config, 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(environ.Bootstrap(false), IsNil)
 
-        conn, err := juju.NewConn("dummyenv")
+        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) {
         dummy.Reset()
         c.Assert(s.Conn.Close(), IsNil)
         s.Conn = nil
@@ skipping 24 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
 }