Skip to content

Commit f8bcd3f

Browse files
wallyworldwallyworld
committed
Replace LoggingSuite with BaseSuite
1 parent 9164073 commit f8bcd3f

File tree

122 files changed

+339
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+339
-433
lines changed

‎agent/agent_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
"launchpad.net/juju-core/state"
1616
"launchpad.net/juju-core/state/api"
1717
"launchpad.net/juju-core/state/api/params"
18-
"launchpad.net/juju-core/testing/testbase"
18+
"launchpad.net/juju-core/testing"
1919
"launchpad.net/juju-core/version"
2020
)
2121

2222
type suite struct {
23-
testbase.LoggingSuite
23+
testing.BaseSuite
2424
}
2525

2626
var _ = gc.Suite(&suite{})

‎agent/bootstrap_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,35 @@ import (
1616
"launchpad.net/juju-core/state"
1717
"launchpad.net/juju-core/state/api/params"
1818
"launchpad.net/juju-core/testing"
19-
"launchpad.net/juju-core/testing/testbase"
2019
"launchpad.net/juju-core/utils"
2120
"launchpad.net/juju-core/version"
2221
)
2322

2423
type bootstrapSuite struct {
25-
testbase.LoggingSuite
24+
testing.BaseSuite
2625
testing.MgoSuite
2726
}
2827

2928
var _ = gc.Suite(&bootstrapSuite{})
3029

3130
func (s *bootstrapSuite) SetUpSuite(c *gc.C) {
32-
s.LoggingSuite.SetUpSuite(c)
31+
s.BaseSuite.SetUpSuite(c)
3332
s.MgoSuite.SetUpSuite(c)
3433
}
3534

3635
func (s *bootstrapSuite) TearDownSuite(c *gc.C) {
3736
s.MgoSuite.TearDownSuite(c)
38-
s.LoggingSuite.TearDownSuite(c)
37+
s.BaseSuite.TearDownSuite(c)
3938
}
4039

4140
func (s *bootstrapSuite) SetUpTest(c *gc.C) {
42-
s.LoggingSuite.SetUpTest(c)
41+
s.BaseSuite.SetUpTest(c)
4342
s.MgoSuite.SetUpTest(c)
4443
}
4544

4645
func (s *bootstrapSuite) TearDownTest(c *gc.C) {
4746
s.MgoSuite.TearDownTest(c)
48-
s.LoggingSuite.TearDownTest(c)
47+
s.BaseSuite.TearDownTest(c)
4948
}
5049

5150
func (s *bootstrapSuite) TestInitializeState(c *gc.C) {

‎agent/format-1.16_whitebox_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
jc "github.com/juju/testing/checkers"
1515

1616
gc "launchpad.net/gocheck"
17-
"launchpad.net/juju-core/testing/testbase"
17+
"launchpad.net/juju-core/testing"
1818
"launchpad.net/juju-core/utils"
1919
"launchpad.net/juju-core/version"
2020
)
2121

2222
type format_1_16Suite struct {
23-
testbase.LoggingSuite
23+
testing.BaseSuite
2424
}
2525

2626
var _ = gc.Suite(&format_1_16Suite{})

‎agent/format-1.18_whitebox_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414

1515
gc "launchpad.net/gocheck"
1616
"launchpad.net/juju-core/state/api/params"
17-
"launchpad.net/juju-core/testing/testbase"
17+
"launchpad.net/juju-core/testing"
1818
"launchpad.net/juju-core/utils"
1919
"launchpad.net/juju-core/version"
2020
)
2121

2222
type format_1_18Suite struct {
23-
testbase.LoggingSuite
23+
testing.BaseSuite
2424
}
2525

2626
var _ = gc.Suite(&format_1_18Suite{})

‎agent/format_whitebox_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
gc "launchpad.net/gocheck"
1212

1313
"launchpad.net/juju-core/state/api/params"
14-
"launchpad.net/juju-core/testing/testbase"
14+
"launchpad.net/juju-core/testing"
1515
"launchpad.net/juju-core/version"
1616
)
1717

1818
type formatSuite struct {
19-
testbase.LoggingSuite
19+
testing.BaseSuite
2020
}
2121

2222
var _ = gc.Suite(&formatSuite{})

‎agent/identity_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
gc "launchpad.net/gocheck"
1111

1212
"launchpad.net/juju-core/state/api/params"
13-
"launchpad.net/juju-core/testing/testbase"
13+
"launchpad.net/juju-core/testing"
1414
"launchpad.net/juju-core/version"
1515
)
1616

1717
type identitySuite struct {
18-
testbase.LoggingSuite
18+
testing.BaseSuite
1919
mongodConfigPath string
2020
mongodPath string
2121
}

‎agent/mongo/mongo_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"launchpad.net/juju-core/instance"
2222
"launchpad.net/juju-core/state/api/params"
23-
"launchpad.net/juju-core/testing/testbase"
23+
coretesting "launchpad.net/juju-core/testing"
2424
"launchpad.net/juju-core/upstart"
2525
"launchpad.net/juju-core/utils"
2626
"launchpad.net/juju-core/version"
@@ -29,7 +29,7 @@ import (
2929
func Test(t *stdtesting.T) { gc.TestingT(t) }
3030

3131
type MongoSuite struct {
32-
testbase.LoggingSuite
32+
coretesting.BaseSuite
3333
mongodConfigPath string
3434
mongodPath string
3535

@@ -50,7 +50,7 @@ var testInfo = params.StateServingInfo{
5050
}
5151

5252
func (s *MongoSuite) SetUpTest(c *gc.C) {
53-
s.LoggingSuite.SetUpTest(c)
53+
s.BaseSuite.SetUpTest(c)
5454
// Try to make sure we don't execute any commands accidentally.
5555
s.PatchEnvironment("PATH", "")
5656

‎agent/mongo/upgrade_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ import (
1212
gc "launchpad.net/gocheck"
1313

1414
coretesting "launchpad.net/juju-core/testing"
15-
"launchpad.net/juju-core/testing/testbase"
1615
"launchpad.net/juju-core/upstart"
1716
)
1817

1918
type EnsureAdminSuite struct {
20-
testbase.LoggingSuite
19+
coretesting.BaseSuite
2120
}
2221

2322
var _ = gc.Suite(&EnsureAdminSuite{})

‎agent/tools/diskmanager_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
agenttools "launchpad.net/juju-core/agent/tools"
1515
coretesting "launchpad.net/juju-core/testing"
16-
"launchpad.net/juju-core/testing/testbase"
1716
coretools "launchpad.net/juju-core/tools"
1817
"launchpad.net/juju-core/version"
1918
)
@@ -23,13 +22,13 @@ var _ = gc.Suite(&DiskManagerSuite{})
2322
var _ agenttools.ToolsManager = (*agenttools.DiskManager)(nil)
2423

2524
type DiskManagerSuite struct {
26-
testbase.LoggingSuite
25+
coretesting.BaseSuite
2726
dataDir string
2827
manager agenttools.ToolsManager
2928
}
3029

3130
func (s *DiskManagerSuite) SetUpTest(c *gc.C) {
32-
s.LoggingSuite.SetUpTest(c)
31+
s.BaseSuite.SetUpTest(c)
3332
s.dataDir = c.MkDir()
3433
s.manager = agenttools.NewDiskManager(s.dataDir)
3534
}

‎agent/tools/tools_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import (
2121
)
2222

2323
type ToolsSuite struct {
24-
testbase.LoggingSuite
24+
testing.BaseSuite
2525
dataDir string
2626
}
2727

2828
var _ = gc.Suite(&ToolsSuite{})
2929

3030
func (t *ToolsSuite) SetUpTest(c *gc.C) {
31-
t.LoggingSuite.SetUpTest(c)
31+
t.BaseSuite.SetUpTest(c)
3232
t.dataDir = c.MkDir()
3333
}
3434

‎bzr/bzr_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ import (
88
"os"
99
"os/exec"
1010
"path/filepath"
11-
"testing"
11+
stdtesting "testing"
1212

1313
gc "launchpad.net/gocheck"
1414

1515
"launchpad.net/juju-core/bzr"
16-
"launchpad.net/juju-core/testing/testbase"
16+
"launchpad.net/juju-core/testing"
1717
)
1818

19-
func Test(t *testing.T) {
19+
func Test(t *stdtesting.T) {
2020
gc.TestingT(t)
2121
}
2222

2323
var _ = gc.Suite(&BzrSuite{})
2424

2525
type BzrSuite struct {
26-
testbase.LoggingSuite
26+
testing.BaseSuite
2727
b *bzr.Branch
2828
}
2929

@@ -32,7 +32,7 @@ email = testing <[email protected]>
3232
`
3333

3434
func (s *BzrSuite) SetUpTest(c *gc.C) {
35-
s.LoggingSuite.SetUpTest(c)
35+
s.BaseSuite.SetUpTest(c)
3636
bzrdir := c.MkDir()
3737
s.PatchEnvironment("BZR_HOME", bzrdir)
3838
err := os.Mkdir(filepath.Join(bzrdir, ".bazaar"), 0755)

‎charm/dir_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ import (
1717

1818
"launchpad.net/juju-core/charm"
1919
"launchpad.net/juju-core/testing"
20-
"launchpad.net/juju-core/testing/testbase"
2120
)
2221

2322
type DirSuite struct {
24-
testbase.LoggingSuite
23+
testing.BaseSuite
2524
}
2625

2726
var _ = gc.Suite(&DirSuite{})

‎charm/repo_test.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@ import (
1515
charmtesting "launchpad.net/juju-core/charm/testing"
1616
env_config "launchpad.net/juju-core/environs/config"
1717
"launchpad.net/juju-core/testing"
18-
"launchpad.net/juju-core/testing/testbase"
1918
)
2019

2120
type StoreSuite struct {
22-
testbase.LoggingSuite
21+
testing.BaseSuite
2322
server *charmtesting.MockStore
2423
store *charm.CharmStore
2524
}
2625

2726
var _ = gc.Suite(&StoreSuite{})
2827

2928
func (s *StoreSuite) SetUpSuite(c *gc.C) {
30-
s.LoggingSuite.SetUpSuite(c)
29+
s.BaseSuite.SetUpSuite(c)
3130
s.server = charmtesting.NewMockStore(c, map[string]int{
3231
"cs:series/good": 23,
3332
"cs:series/unwise": 23,
@@ -37,7 +36,7 @@ func (s *StoreSuite) SetUpSuite(c *gc.C) {
3736
}
3837

3938
func (s *StoreSuite) SetUpTest(c *gc.C) {
40-
s.LoggingSuite.SetUpTest(c)
39+
s.BaseSuite.SetUpTest(c)
4140
s.PatchValue(&charm.CacheDir, c.MkDir())
4241
s.store = charm.NewStore(s.server.Address())
4342
s.server.Downloads = nil
@@ -48,11 +47,9 @@ func (s *StoreSuite) SetUpTest(c *gc.C) {
4847
s.server.InfoRequestCountNoStats = 0
4948
}
5049

51-
// Uses the TearDownTest from testbase.LoggingSuite
52-
5350
func (s *StoreSuite) TearDownSuite(c *gc.C) {
5451
s.server.Close()
55-
s.LoggingSuite.TearDownSuite(c)
52+
s.BaseSuite.TearDownSuite(c)
5653
}
5754

5855
func (s *StoreSuite) TestMissing(c *gc.C) {
@@ -229,7 +226,7 @@ func (s *StoreSuite) TestInfoTestModeFlag(c *gc.C) {
229226
}
230227

231228
func (s *StoreSuite) TestInfoDNSError(c *gc.C) {
232-
store := charm.NewStore("http://0.1.2.3")
229+
store := charm.NewStore("http://127.1.2.3")
233230
charmURL := charm.MustParseURL("cs:series/good")
234231
resp, err := store.Info(charmURL)
235232
c.Assert(resp, gc.IsNil)
@@ -377,15 +374,15 @@ func (s *StoreSuite) TestCharmURL(c *gc.C) {
377374
}
378375

379376
type LocalRepoSuite struct {
380-
testbase.LoggingSuite
377+
testing.BaseSuite
381378
repo *charm.LocalRepository
382379
seriesPath string
383380
}
384381

385382
var _ = gc.Suite(&LocalRepoSuite{})
386383

387384
func (s *LocalRepoSuite) SetUpTest(c *gc.C) {
388-
s.LoggingSuite.SetUpTest(c)
385+
s.BaseSuite.SetUpTest(c)
389386
root := c.MkDir()
390387
s.repo = &charm.LocalRepository{Path: root}
391388
s.seriesPath = filepath.Join(root, "quantal")

‎cloudinit/cloudinit_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010
gc "launchpad.net/gocheck"
1111

1212
"launchpad.net/juju-core/cloudinit"
13-
"launchpad.net/juju-core/testing/testbase"
13+
coretesting "launchpad.net/juju-core/testing"
1414
sshtesting "launchpad.net/juju-core/utils/ssh/testing"
1515
)
1616

1717
// TODO integration tests, but how?
1818

1919
type S struct {
20-
testbase.LoggingSuite
20+
coretesting.BaseSuite
2121
}
2222

2323
var _ = gc.Suite(S{})

‎cloudinit/sshinit/configure_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ import (
1717
envtools "launchpad.net/juju-core/environs/tools"
1818
"launchpad.net/juju-core/state/api/params"
1919
coretesting "launchpad.net/juju-core/testing"
20-
"launchpad.net/juju-core/testing/testbase"
2120
"launchpad.net/juju-core/tools"
2221
"launchpad.net/juju-core/version"
2322
)
2423

2524
type configureSuite struct {
26-
testbase.LoggingSuite
25+
coretesting.BaseSuite
2726
}
2827

2928
var _ = gc.Suite(&configureSuite{})

‎cmd/charm-admin/config_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ import (
1212

1313
"launchpad.net/juju-core/cmd"
1414
"launchpad.net/juju-core/testing"
15-
"launchpad.net/juju-core/testing/testbase"
1615
)
1716

1817
type ConfigSuite struct {
19-
testbase.LoggingSuite
18+
testing.BaseSuite
2019
}
2120

2221
var _ = gc.Suite(&ConfigSuite{})
@@ -28,11 +27,11 @@ bar: false
2827
`
2928

3029
func (s *ConfigSuite) SetUpSuite(c *gc.C) {
31-
s.LoggingSuite.SetUpSuite(c)
30+
s.BaseSuite.SetUpSuite(c)
3231
}
3332

3433
func (s *ConfigSuite) TearDownSuite(c *gc.C) {
35-
s.LoggingSuite.TearDownSuite(c)
34+
s.BaseSuite.TearDownSuite(c)
3635
}
3736

3837
type SomeConfigCommand struct {

0 commit comments

Comments
 (0)