cmd/juju: simplify testing infrastructure.

cmd/juju/addunit_test.go

 package main
 
 import (
         "bytes"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/cmd"
-        "launchpad.net/juju-core/testing"
+        coretesting "launchpad.net/juju-core/testing"

[niemeyer, 2012/08/27 13:29:10]

Why renaming it here? If we're renaming it even when there are no conflicts, the
package seems misnamed.

[rog, 2012/08/28 17:36:08]

there was an intermediate state where both packages were imported. done.

 )
 
 type AddUnitSuite struct {
-        DeploySuite
+        repoSuite
 }
 
 var _ = Suite(&AddUnitSuite{})
 
-func (s *AddUnitSuite) SetUpTest(c *C) {
-        s.DeploySuite.SetUpTest(c)
-}
-
-func (s *AddUnitSuite) TearDownTest(c *C) {
-        s.DeploySuite.TearDownTest(c)
-}
-
 func runAddUnit(c *C, args ...string) error {
         com := &AddUnitCommand{}
         err := com.Init(newFlagSet(), args)
         c.Assert(err, IsNil)
         return com.Run(&cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}})
 }
 
 func (s *AddUnitSuite) TestAddUnit(c *C) {
-        testing.Charms.BundlePath(s.seriesPath, "dummy")
+        coretesting.Charms.BundlePath(s.seriesPath, "dummy")
         err := runDeploy(c, "local:dummy", "some-service-name")
         c.Assert(err, IsNil)
         curl := charm.MustParseURL("local:precise/dummy-1")
         s.assertService(c, "some-service-name", curl, 1, 0)
 
         err = runAddUnit(c, "some-service-name")
         c.Assert(err, IsNil)
         s.assertService(c, "some-service-name", curl, 2, 0)
 
         err = runAddUnit(c, "--num-units", "2", "some-service-name")
         c.Assert(err, IsNil)
         s.assertService(c, "some-service-name", curl, 4, 0)
 }