Skip to content

Commit

Permalink
add the import
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Penhey committed Sep 20, 2013
1 parent f1a96a0 commit 4c2d04b
Show file tree
Hide file tree
Showing 72 changed files with 74 additions and 0 deletions.
1 change: 1 addition & 0 deletions charm/dir_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (

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

type DirSuite struct {
Expand Down
1 change: 1 addition & 0 deletions charm/repo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (

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

type MockStore struct {
Expand Down
1 change: 1 addition & 0 deletions cmd/juju/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"launchpad.net/juju-core/errors"
"launchpad.net/juju-core/provider/dummy"
coretesting "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: 1 addition & 0 deletions cmd/juju/plugin_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

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

type PluginSuite struct {
Expand Down
1 change: 1 addition & 0 deletions cmd/juju/publish_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"launchpad.net/juju-core/charm"
"launchpad.net/juju-core/cmd"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

// Sadly, this is a very slow test suite, heavily dominated by calls to bzr.
Expand Down
1 change: 1 addition & 0 deletions cmd/juju/synctools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"launchpad.net/juju-core/provider/dummy"
coretesting "launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
)

type syncToolsSuite struct {
Expand Down
1 change: 1 addition & 0 deletions cmd/jujud/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"launchpad.net/juju-core/state/api/params"
coretesting "launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
coretools "launchpad.net/juju-core/tools"
"launchpad.net/juju-core/version"
"launchpad.net/juju-core/worker"
Expand Down
1 change: 1 addition & 0 deletions cmd/jujud/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"launchpad.net/juju-core/provider/dummy"
"launchpad.net/juju-core/state"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/utils"
)

Expand Down
1 change: 1 addition & 0 deletions container/lxc/lxc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
jujutesting "launchpad.net/juju-core/juju/testing"
"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"
)
Expand Down
1 change: 1 addition & 0 deletions downloader/downloader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

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

type suite struct {
Expand Down
1 change: 1 addition & 0 deletions environs/bootstrap/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
envtesting "launchpad.net/juju-core/environs/testing"
"launchpad.net/juju-core/provider/dummy"
coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/tools"
"launchpad.net/juju-core/version"
)
Expand Down
1 change: 1 addition & 0 deletions environs/cert_internal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

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

// EnvironsCertSuite tests the internal functions defined in environs/cert.go
Expand Down
1 change: 1 addition & 0 deletions environs/cert_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"launchpad.net/juju-core/environs"
"launchpad.net/juju-core/environs/config"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

type EnvironsCertSuite struct {
Expand Down
1 change: 1 addition & 0 deletions environs/cloudinit/cloudinit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"launchpad.net/juju-core/state"
"launchpad.net/juju-core/state/api"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/tools"
"launchpad.net/juju-core/version"
)
Expand Down
1 change: 1 addition & 0 deletions environs/cloudinit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"launchpad.net/juju-core/state"
"launchpad.net/juju-core/state/api"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/tools"
"launchpad.net/juju-core/utils"
"launchpad.net/juju-core/version"
Expand Down
1 change: 1 addition & 0 deletions environs/config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"launchpad.net/juju-core/schema"
"launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/version"
)

Expand Down
1 change: 1 addition & 0 deletions environs/httpstorage/backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"launchpad.net/juju-core/environs/filestorage"
"launchpad.net/juju-core/environs/httpstorage"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

func TestLocal(t *stdtesting.T) {
Expand Down
1 change: 1 addition & 0 deletions environs/imagemetadata/validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"launchpad.net/juju-core/environs/imagemetadata"
"launchpad.net/juju-core/environs/simplestreams"
coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

type ValidateSuite struct {
Expand Down
1 change: 1 addition & 0 deletions environs/instances/image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"launchpad.net/juju-core/environs/imagemetadata"
"launchpad.net/juju-core/environs/simplestreams"
coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

type imageSuite struct {
Expand Down
1 change: 1 addition & 0 deletions environs/instances/instancetype_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

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

type instanceTypeSuite struct {
Expand Down
1 change: 1 addition & 0 deletions environs/jujutest/livetests.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
statetesting "launchpad.net/juju-core/state/testing"
coretesting "launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
coretools "launchpad.net/juju-core/tools"
"launchpad.net/juju-core/utils"
"launchpad.net/juju-core/version"
Expand Down
1 change: 1 addition & 0 deletions environs/jujutest/tests.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"launchpad.net/juju-core/juju/testing"
coretesting "launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/utils"
"launchpad.net/juju-core/version"
)
Expand Down
1 change: 1 addition & 0 deletions environs/manual/detection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

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

type detectionSuite struct {
Expand Down
1 change: 1 addition & 0 deletions environs/mongo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"launchpad.net/juju-core/environs"
"launchpad.net/juju-core/provider/dummy"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/version"
)

Expand Down
1 change: 1 addition & 0 deletions environs/simplestreams/testing/testing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"launchpad.net/juju-core/environs/jujutest"
"launchpad.net/juju-core/environs/simplestreams"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

var imageData = map[string]string{
Expand Down
1 change: 1 addition & 0 deletions environs/sshstorage/storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
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: 1 addition & 0 deletions environs/sync/sync_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
envtools "launchpad.net/juju-core/environs/tools"
"launchpad.net/juju-core/provider/dummy"
coretesting "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: 1 addition & 0 deletions environs/tools/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

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

type buildSuite struct {
Expand Down
1 change: 1 addition & 0 deletions environs/tools/storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
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: 1 addition & 0 deletions environs/tools/tools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"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"
"launchpad.net/juju-core/version"
)
Expand Down
1 change: 1 addition & 0 deletions environs/tools/validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"launchpad.net/juju-core/environs/config"
"launchpad.net/juju-core/environs/simplestreams"
coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

type ValidateSuite struct {
Expand Down
1 change: 1 addition & 0 deletions instance/address_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
gc "launchpad.net/gocheck"

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

type AddressSuite struct {
Expand Down
2 changes: 2 additions & 0 deletions juju/apiconn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import (
"launchpad.net/juju-core/state/api"
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
2 changes: 2 additions & 0 deletions juju/conn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import (
"launchpad.net/juju-core/state"
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
1 change: 1 addition & 0 deletions juju/testing/conn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"launchpad.net/juju-core/state"
"launchpad.net/juju-core/state/api"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/version"
)

Expand Down
1 change: 1 addition & 0 deletions provider/azure/azure_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

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

func TestAzureProvider(t *stdtesting.T) {
Expand Down
1 change: 1 addition & 0 deletions provider/azure/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

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

type configSuite struct {
Expand Down
1 change: 1 addition & 0 deletions provider/azure/customdata_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"launchpad.net/juju-core/state"
"launchpad.net/juju-core/state/api"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/tools"
)

Expand Down
1 change: 1 addition & 0 deletions provider/ec2/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"launchpad.net/juju-core/environs/config"
"launchpad.net/juju-core/juju/osenv"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

// Use local suite since this file lives in the ec2 package
Expand Down
1 change: 1 addition & 0 deletions provider/ec2/image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"launchpad.net/juju-core/environs/instances"
"launchpad.net/juju-core/environs/simplestreams"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

type imageSuite struct {
Expand Down
1 change: 1 addition & 0 deletions provider/ec2/live_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"launchpad.net/juju-core/provider/ec2"
coretesting "launchpad.net/juju-core/testing"
jc "launchpad.net/juju-core/testing/checkers"
"launchpad.net/juju-core/testing/testbase"
"launchpad.net/juju-core/version"
)

Expand Down
1 change: 1 addition & 0 deletions provider/ec2/local_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"launchpad.net/juju-core/provider/ec2"
"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: 1 addition & 0 deletions provider/local/environprovider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"launchpad.net/juju-core/container/lxc"
"launchpad.net/juju-core/provider/local"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

type baseProviderSuite struct {
Expand Down
1 change: 1 addition & 0 deletions provider/local/local_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"launchpad.net/juju-core/provider"
"launchpad.net/juju-core/provider/local"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

func TestLocal(t *stdtesting.T) {
Expand Down
1 change: 1 addition & 0 deletions provider/local/prereqs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
gc "launchpad.net/gocheck"

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

type prereqsSuite struct {
Expand Down
1 change: 1 addition & 0 deletions provider/maas/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

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

type configSuite struct {
Expand Down
1 change: 1 addition & 0 deletions provider/maas/maas_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

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

func TestMAAS(t *stdtesting.T) {
Expand Down
1 change: 1 addition & 0 deletions provider/openstack/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"launchpad.net/juju-core/environs"
"launchpad.net/juju-core/environs/config"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

type ConfigSuite struct {
Expand Down
1 change: 1 addition & 0 deletions provider/openstack/live_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
envtesting "launchpad.net/juju-core/environs/testing"
"launchpad.net/juju-core/provider/openstack"
coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/testing/testbase"
)

// generate a different bucket name for each config instance, so that
Expand Down
Loading

0 comments on commit 4c2d04b

Please sign in to comment.