| Index: juju/testing/conn.go |
| === modified file 'juju/testing/conn.go' |
| --- juju/testing/conn.go 2012-09-12 22:31:00 +0000 |
| +++ juju/testing/conn.go 2012-09-21 13:37:42 +0000 |
| @@ -30,7 +30,7 @@ |
| // $HOME is set to point to RootDir/home/ubuntu. |
| type JujuConnSuite struct { |
| testing.LoggingSuite |
| - testing.ZkSuite |
| + testing.MgoSuite |
| Conn *juju.Conn |
| State *state.State |
| RootDir string // The faked-up root directory. |
| @@ -41,30 +41,30 @@ |
| environments: |
| dummyenv: |
| type: dummy |
| - zookeeper: true |
| + state-server: true |
| authorized-keys: 'i-am-a-key' |
| default-series: decrepit |
| `) |
| func (s *JujuConnSuite) SetUpSuite(c *C) { |
| s.LoggingSuite.SetUpSuite(c) |
| - s.ZkSuite.SetUpSuite(c) |
| + s.MgoSuite.SetUpSuite(c) |
| } |
| func (s *JujuConnSuite) TearDownSuite(c *C) { |
| - s.ZkSuite.TearDownSuite(c) |
| + s.MgoSuite.TearDownSuite(c) |
| s.LoggingSuite.TearDownSuite(c) |
| } |
| func (s *JujuConnSuite) SetUpTest(c *C) { |
| s.LoggingSuite.SetUpTest(c) |
| - s.ZkSuite.SetUpTest(c) |
| + s.MgoSuite.SetUpTest(c) |
| s.setUpConn(c) |
| } |
| func (s *JujuConnSuite) TearDownTest(c *C) { |
| s.tearDownConn(c) |
| - s.ZkSuite.TearDownTest(c) |
| + s.MgoSuite.TearDownTest(c) |
| s.LoggingSuite.TearDownTest(c) |
| } |
| @@ -138,10 +138,6 @@ |
| } |
| } |
| -func (s *JujuConnSuite) StateInfo(c *C) *state.Info { |
| - return &state.Info{Addrs: []string{testing.ZkAddr}} |
| -} |
| - |
| func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm { |
| ch := testing.Charms.Dir("series", name) |
| ident := fmt.Sprintf("%s-%d", name, ch.Revision()) |
