Skip to content

Commit

Permalink
Fixed outdated import
Browse files Browse the repository at this point in the history
  • Loading branch information
@bogdanteleaga
bogdanteleaga committed Sep 25, 2014
1 parent d64fd77 commit 11a31b0
Show file tree
Hide file tree
Showing 582 changed files with 691 additions and 692 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,16 @@ group is alphabetically sorted. eg:
"time"

"labix.org/v2/mgo"
gc "launchpad.net/gocheck"
"github.com/juju/loggo"
gc "gopkg.in/check.v1"

"github.com/juju/juju/state"
"github.com/juju/juju/worker"
)

```

Because "launchpad.net/gocheck" will be referenced frequently in test suites,
Because "gopkg.in/check.v1" will be referenced frequently in test suites,
its name gets a default short name of just "gc".


Expand Down Expand Up @@ -261,7 +261,7 @@ Testing

`juju` uses the `gocheck` testing framework. `gocheck` is automatically
installed as a dependency of `juju`. You can read more about `gocheck`
at http://go.pkgdoc.org/pkg/launchpad.net/gocheck. `gocheck` is integrated
at http://godoc.org/gopkg.in/check.v1. `gocheck` is integrated
into the source of each package so the standard `go test` command is used
to run `gocheck` tests. For example

Expand Down
2 changes: 1 addition & 1 deletion agent/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/agent"
"github.com/juju/juju/api"
Expand Down
2 changes: 1 addition & 1 deletion agent/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/agent"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion agent/format-1.16_whitebox_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/testing"
"github.com/juju/juju/version"
Expand Down
2 changes: 1 addition & 1 deletion agent/format-1.18_whitebox_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/testing"
Expand Down
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 (

"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion agent/identity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"

"github.com/juju/names"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion agent/tools/diskmanager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"
"path/filepath"

gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

agenttools "github.com/juju/juju/agent/tools"
coretesting "github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion agent/tools/package_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package tools_test
import (
"testing"

gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"
)

func Test(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion agent/tools/tools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"path/filepath"
"sort"

gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

agenttools "github.com/juju/juju/agent/tools"
"github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/agent/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/juju/errors"
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2"
gc "launchpad.net/gocheck"

"github.com/juju/juju/api"
apiserveragent "github.com/juju/juju/apiserver/agent"
Expand Down
2 changes: 1 addition & 1 deletion api/agent/unit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/apiclient_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/juju/names"
"github.com/juju/utils/parallel"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/backups/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package backups_test

import (
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/backups"
"github.com/juju/juju/apiserver/params"
Expand Down
4 changes: 2 additions & 2 deletions api/charmrevisionupdater/updater_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package charmrevisionupdater_test

import (
"github.com/juju/utils"
"gopkg.in/juju/charm.v3"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v4"

"github.com/juju/juju/api/charmrevisionupdater"
"github.com/juju/juju/apiserver/charmrevisionupdater/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/juju/loggo"
"github.com/juju/names"
"github.com/juju/utils"
"gopkg.in/juju/charm.v3"
"gopkg.in/juju/charm.v4"

"github.com/juju/juju/api/base"
"github.com/juju/juju/apiserver/params"
Expand Down
6 changes: 3 additions & 3 deletions api/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/juju/loggo"
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
"gopkg.in/juju/charm.v3"
charmtesting "gopkg.in/juju/charm.v3/testing"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v4"
charmtesting "gopkg.in/juju/charm.v4/testing"

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/deployer/deployer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/deployer"
Expand Down
2 changes: 1 addition & 1 deletion api/environment/environment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package environment_test

import (
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

apitesting "github.com/juju/juju/api/testing"
jujutesting "github.com/juju/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/facadeversions_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package api_test

import (
"github.com/juju/utils/set"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/firewaller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package firewaller_test

import (
"github.com/juju/utils"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/errors"
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/base"
"github.com/juju/juju/api/firewaller"
Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package firewaller_test
import (
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/firewaller"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package firewaller_test
import (
"github.com/juju/errors"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/firewaller"
apitesting "github.com/juju/juju/api/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/unit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/errors"
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/base"
"github.com/juju/juju/api/firewaller"
Expand Down
2 changes: 1 addition & 1 deletion api/highavailability/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package highavailability_test
import (
stdtesting "testing"

gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/highavailability"
"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion api/keymanager/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package keymanager_test
import (
"strings"

gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/keymanager"
keymanagerserver "github.com/juju/juju/apiserver/keymanager"
Expand Down
2 changes: 1 addition & 1 deletion api/keyupdater/authorisedkeys_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package keyupdater_test

import (
"github.com/juju/names"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/keyupdater"
Expand Down
2 changes: 1 addition & 1 deletion api/logger/logger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package logger_test

import (
"github.com/juju/names"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/logger"
Expand Down
2 changes: 1 addition & 1 deletion api/machiner/machiner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/juju/errors"
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/machiner"
Expand Down
2 changes: 1 addition & 1 deletion api/metricsmanager/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package metricsmanager_test

import (
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/metricsmanager"
"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion api/networker/networker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/networker"
Expand Down
2 changes: 1 addition & 1 deletion api/provisioner/provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/provisioner"
Expand Down
2 changes: 1 addition & 1 deletion api/rsyslog/rsyslog_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package rsyslog_test

import (
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
"github.com/juju/juju/api/rsyslog"
Expand Down
2 changes: 1 addition & 1 deletion api/state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package api_test
import (
stdtesting "testing"

gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api"
jujutesting "github.com/juju/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/testing/apiaddresser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package testing

import (
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/watcher"
"github.com/juju/juju/network"
Expand Down
2 changes: 1 addition & 1 deletion api/testing/environwatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package testing

import (
jc "github.com/juju/testing/checkers"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/watcher"
"github.com/juju/juju/environs"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/action_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package uniter_test

import (
"github.com/juju/names"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/uniter"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/charm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/url"
"path"

"gopkg.in/juju/charm.v3"
"gopkg.in/juju/charm.v4"

"github.com/juju/juju/apiserver/params"
"github.com/juju/names"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/charm_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/url"

"github.com/juju/names"
gc "launchpad.net/gocheck"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/uniter"
"github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/endpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package uniter

import (
"gopkg.in/juju/charm.v3"
"gopkg.in/juju/charm.v4"
)

// Endpoint represents one endpoint of a relation. It is just a wrapper
Expand Down
Loading

0 comments on commit 11a31b0

Please sign in to comment.