Do not use BaseSuite in utils if not required.

utils/apt/apt_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package apt_test
 
 import (
         "fmt"
         "io/ioutil"
         "path/filepath"
         stdtesting "testing"
 
+        "github.com/juju/testing"
         jc "github.com/juju/testing/checkers"
         gc "launchpad.net/gocheck"
 
-        "launchpad.net/juju-core/testing"
+        "launchpad.net/juju-core/testing/testbase"
         "launchpad.net/juju-core/utils/apt"
         "launchpad.net/juju-core/utils/proxy"
 )
 
 func TestPackage(t *stdtesting.T) {
         gc.TestingT(t)
 }
 
 type AptSuite struct {
-        testing.BaseSuite
+        testing.CleanupSuite
+        testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&AptSuite{})
 
+func (s *AptSuite) SetUpTest(c *gc.C) {
+        s.LoggingSuite.SetUpTest(c)

[fwereade, 2014/05/27 07:50:21]

doesn't CleanupSuite have SetUpTest/TearDownTest? I feel like it should.,..

+}
+
+func (s *AptSuite) TearDownTest(c *gc.C) {
+        s.LoggingSuite.TearDownTest(c)
+}
+
 func (s *AptSuite) TestOnePackage(c *gc.C) {
         cmdChan := s.HookCommandOutput(&apt.CommandOutput, []byte{}, nil)
         err := apt.GetInstall("test-package")
         c.Assert(err, gc.IsNil)
         cmd := <-cmdChan
         c.Assert(cmd.Args, gc.DeepEquals, []string{
                 "apt-get", "--option=Dpkg::Options::=--force-confold",
                 "--option=Dpkg::options::=--force-unsafe-io", "--assume-yes", "--quiet",
                 "install", "test-package",
         })
@@ skipping 172 matching lines @@
 
 type EnvironmentPatcher interface {
         PatchEnvironment(name, value string)
 }
 
 func patchExecutable(patcher EnvironmentPatcher, dir, execName, script string) {
         patcher.PatchEnvironment("PATH", dir)
         filename := filepath.Join(dir, execName)
         ioutil.WriteFile(filename, []byte(script), 0755)
 }