juju: always connect to State.

juju/deploy_test.go

 package juju_test
 
 import (
         "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"
         "launchpad.net/juju-core/state"
@@ skipping 14 matching lines @@
         attrs := map[string]interface{}{
                 "name":            "erewhemos",
                 "type":            "dummy",
                 "zookeeper":       true,
                 "authorized-keys": "i-am-a-key",
         }
         environ, err := environs.NewFromAttrs(attrs)
         c.Assert(err, IsNil)
         err = environ.Bootstrap(false)
         c.Assert(err, IsNil)
-        s.conn, err = juju.NewConnFromEnviron(environ)
+        s.conn, err = juju.NewConn(environ)
         c.Assert(err, IsNil)
         s.repo = &charm.LocalRepository{Path: c.MkDir()}
 }
 
 func (s *DeploySuite) TearDownTest(c *C) {
         if s.conn == nil {
                 return
         }
         err := s.conn.Environ.Destroy(nil)
         c.Check(err, IsNil)
@@ skipping 125 matching lines @@
         units, err := s.conn.AddUnits(svc, 2)
         c.Assert(err, IsNil)
         c.Assert(units, HasLen, 2)
 
         id0, err := units[0].AssignedMachineId()
         c.Assert(err, IsNil)
         id1, err := units[1].AssignedMachineId()
         c.Assert(err, IsNil)
         c.Assert(id0, Not(Equals), id1)
 }