Skip to content

Commit

Permalink
Make the tests pass.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Penhey committed Sep 20, 2013
1 parent bb20ec8 commit ca56086
Show file tree
Hide file tree
Showing 27 changed files with 6 additions and 28 deletions.
2 changes: 1 addition & 1 deletion agent/format_whitebox_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

gc "launchpad.net/gocheck"

"launchpad.net/juju-core/testbase"
"launchpad.net/juju-core/testing/testbase"
)

type formatSuite struct {
Expand Down
1 change: 1 addition & 0 deletions cmd/jujud/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"launchpad.net/juju-core/state/watcher"
"launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/tools"
"launchpad.net/juju-core/version"
"launchpad.net/juju-core/worker/deployer"
Expand Down
1 change: 0 additions & 1 deletion environs/httpstorage/backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (

"launchpad.net/juju-core/environs/filestorage"
"launchpad.net/juju-core/environs/httpstorage"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion environs/instances/image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"launchpad.net/juju-core/constraints"
"launchpad.net/juju-core/environs/imagemetadata"
"launchpad.net/juju-core/environs/simplestreams"
coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion environs/instances/instancetype_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
gc "launchpad.net/gocheck"

"launchpad.net/juju-core/constraints"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion environs/manual/detection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

gc "launchpad.net/gocheck"

"launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
)
Expand Down
1 change: 0 additions & 1 deletion environs/simplestreams/testing/testing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

"launchpad.net/juju-core/environs/jujutest"
"launchpad.net/juju-core/environs/simplestreams"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion environs/sshstorage/storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

"launchpad.net/juju-core/environs/storage"
coreerrors "launchpad.net/juju-core/errors"
"launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/utils"
Expand Down
1 change: 0 additions & 1 deletion environs/tools/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
gc "launchpad.net/gocheck"

"launchpad.net/juju-core/environs/tools"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion environs/tools/storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
envtesting "launchpad.net/juju-core/environs/testing"
envtools "launchpad.net/juju-core/environs/tools"
"launchpad.net/juju-core/provider/dummy"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
coretools "launchpad.net/juju-core/tools"
"launchpad.net/juju-core/version"
Expand Down
1 change: 0 additions & 1 deletion environs/tools/tools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
envtools "launchpad.net/juju-core/environs/tools"
"launchpad.net/juju-core/errors"
"launchpad.net/juju-core/provider/dummy"
"launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
coretools "launchpad.net/juju-core/tools"
Expand Down
1 change: 0 additions & 1 deletion instance/address_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

gc "launchpad.net/gocheck"

"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
3 changes: 1 addition & 2 deletions juju/apiconn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
coretesting "launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/testing/testbase"
)

type NewAPIConnSuite struct {
Expand Down Expand Up @@ -346,7 +345,7 @@ func assertEnvironmentName(c *gc.C, client *api.Client, expectName string) {
c.Assert(envInfo.Name, gc.Equals, expectName)
}

func setAPIClosed() (<-chan *api.State, coretesting.Restorer) {
func setAPIClosed() (<-chan *api.State, testbase.Restorer) {
stateClosed := make(chan *api.State)
apiClose := func(st *api.State) error {
stateClosed <- st
Expand Down
1 change: 0 additions & 1 deletion juju/conn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
coretesting "launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/utils"
"launchpad.net/juju-core/utils/set"
)
Expand Down
4 changes: 2 additions & 2 deletions juju/osenv/package_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

gc "launchpad.net/gocheck"

coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

func Test(t *testing.T) {
Expand All @@ -21,6 +21,6 @@ var _ = gc.Suite(&importSuite{})

func (*importSuite) TestDependencies(c *gc.C) {
// This test is to ensure we don't bring in dependencies at all.
c.Assert(coretesting.FindJujuCoreImports(c, "launchpad.net/juju-core/juju/osenv"),
c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/juju/osenv"),
gc.HasLen, 0)
}
2 changes: 1 addition & 1 deletion juju/osenv/vars_linux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
gc "launchpad.net/gocheck"

"launchpad.net/juju-core/juju/osenv"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

func (*importSuite) TestHomeLinux(c *gc.C) {
Expand Down
1 change: 0 additions & 1 deletion provider/azure/azure_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
gc "launchpad.net/gocheck"

envtesting "launchpad.net/juju-core/environs/testing"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion provider/ec2/image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"launchpad.net/juju-core/environs/imagemetadata"
"launchpad.net/juju-core/environs/instances"
"launchpad.net/juju-core/environs/simplestreams"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion provider/local/local_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"launchpad.net/juju-core/environs"
"launchpad.net/juju-core/provider"
"launchpad.net/juju-core/provider/local"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion provider/local/prereqs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

gc "launchpad.net/gocheck"

"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion provider/maas/maas_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"launchpad.net/gomaasapi"

envtesting "launchpad.net/juju-core/environs/testing"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion rpc/jsoncodec/codec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

"launchpad.net/juju-core/rpc"
"launchpad.net/juju-core/rpc/jsoncodec"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion rpc/rpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"launchpad.net/juju-core/log"
"launchpad.net/juju-core/rpc"
"launchpad.net/juju-core/rpc/jsoncodec"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion state/apiserver/common/errors_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"launchpad.net/juju-core/state"
"launchpad.net/juju-core/state/api/params"
"launchpad.net/juju-core/state/apiserver/common"
"launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
)
Expand Down
1 change: 0 additions & 1 deletion state/multiwatcher/multiwatcher_internal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (

"launchpad.net/juju-core/state/api/params"
"launchpad.net/juju-core/state/watcher"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

Expand Down
1 change: 0 additions & 1 deletion worker/runner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
gc "launchpad.net/gocheck"
"launchpad.net/tomb"

coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/worker"
)
Expand Down
1 change: 0 additions & 1 deletion worker/uniter/debug/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (

gc "launchpad.net/gocheck"

"launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
)
Expand Down

0 comments on commit ca56086

Please sign in to comment.