/juju

all: sort imports in the standard way #1601

Merged
merged 1 commit into from Feb 16, 2015
Commits
Jump to file or symbol
Failed to load files and symbols.
+117 −109
Split
View
3 api/annotations/package_test.go
@@ -4,8 +4,9 @@
package annotations_test
import (
- gc "gopkg.in/check.v1"
"testing"
+
+ gc "gopkg.in/check.v1"
)
func TestAll(t *testing.T) {
View
3 api/charms/package_test.go
@@ -4,8 +4,9 @@
package charms_test
import (
- gc "gopkg.in/check.v1"
"testing"
+
+ gc "gopkg.in/check.v1"
)
func TestAll(t *testing.T) {
View
2 api/diskformatter/diskformatter_test.go
@@ -6,14 +6,14 @@ package diskformatter_test
import (
"errors"
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"github.com/juju/juju/api/base/testing"
"github.com/juju/juju/api/diskformatter"
"github.com/juju/juju/apiserver/params"
coretesting "github.com/juju/juju/testing"
- "github.com/juju/names"
)
var _ = gc.Suite(&DiskFormatterSuite{})
View
2 api/diskmanager/diskmanager_test.go
@@ -7,6 +7,7 @@ import (
"errors"
"fmt"
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
@@ -15,7 +16,6 @@ import (
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/storage"
coretesting "github.com/juju/juju/testing"
- "github.com/juju/names"
)
var _ = gc.Suite(&DiskManagerSuite{})
View
2 api/storage/client_test.go
@@ -6,13 +6,13 @@ package storage_test
import (
"github.com/juju/names"
jc "github.com/juju/testing/checkers"
+ "github.com/juju/utils/set"
gc "gopkg.in/check.v1"
basetesting "github.com/juju/juju/api/base/testing"
"github.com/juju/juju/api/storage"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/testing"
- "github.com/juju/utils/set"
)
type storageMockSuite struct {
View
2 api/uniter/charm.go
@@ -7,9 +7,9 @@ import (
"fmt"
"net/url"
+ "github.com/juju/errors"
"gopkg.in/juju/charm.v4"
- "github.com/juju/errors"
"github.com/juju/juju/apiserver/params"
)
View
3 apiserver/annotations/state.go
@@ -4,8 +4,9 @@
package annotations
import (
- "github.com/juju/juju/state"
"github.com/juju/names"
+
+ "github.com/juju/juju/state"
)
type annotationAccess interface {
View
2 apiserver/charms/client.go
@@ -5,13 +5,13 @@ package charms
import (
"github.com/juju/errors"
+ "github.com/juju/utils/set"
"gopkg.in/juju/charm.v4"
"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
- "github.com/juju/utils/set"
)
func init() {
View
7 apiserver/charms/client_test.go
@@ -4,15 +4,16 @@
package charms_test
import (
+ jc "github.com/juju/testing/checkers"
+ gc "gopkg.in/check.v1"
+ "gopkg.in/juju/charm.v4"
+
"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/charms"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/apiserver/testing"
jujutesting "github.com/juju/juju/juju/testing"
- jc "github.com/juju/testing/checkers"
- gc "gopkg.in/check.v1"
- "gopkg.in/juju/charm.v4"
)
type baseCharmsSuite struct {
View
3 apiserver/charms/state.go
@@ -4,8 +4,9 @@
package charms
import (
- "github.com/juju/juju/state"
"gopkg.in/juju/charm.v4"
+
+ "github.com/juju/juju/state"
)
type charmsAccess interface {
View
3 apiserver/common/block_test.go
@@ -4,11 +4,10 @@
package common_test
import (
+ "github.com/juju/errors"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
- "github.com/juju/errors"
-
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/testing"
View
2 apiserver/common/common_test.go
@@ -7,12 +7,12 @@ import (
"fmt"
stdtesting "testing"
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"github.com/juju/juju/apiserver/common"
coretesting "github.com/juju/juju/testing"
- "github.com/juju/names"
)
func TestAll(t *stdtesting.T) {
View
3 apiserver/common/ensuredead.go
@@ -5,9 +5,10 @@ package common
import (
"github.com/juju/errors"
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
// DeadEnsurer implements a common EnsureDead method for use by
View
3 apiserver/common/instanceidgetter.go
@@ -4,10 +4,11 @@
package common
import (
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/instance"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
// InstanceIdGetter implements a common InstanceId method for use by
View
3 apiserver/common/life.go
@@ -5,9 +5,10 @@ package common
import (
"github.com/juju/errors"
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
// LifeGetter implements a common Life method for use by various facades.
View
2 apiserver/common/life_test.go
@@ -6,14 +6,14 @@ package common_test
import (
"fmt"
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
type lifeSuite struct{}
View
3 apiserver/common/reboot.go
@@ -2,9 +2,10 @@ package common
import (
"github.com/juju/errors"
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
// RebootRequester implements the RequestReboot API method
View
3 apiserver/common/remove.go
@@ -7,9 +7,10 @@ import (
"fmt"
"github.com/juju/errors"
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
// Remover implements a common Remove method for use by various facades.
View
2 apiserver/common/remove_test.go
@@ -6,14 +6,14 @@ package common_test
import (
"fmt"
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
type removeSuite struct{}
View
3 apiserver/common/setstatus.go
@@ -7,9 +7,10 @@ import (
"fmt"
"github.com/juju/errors"
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
// StatusSetter implements a common SetStatus method for use by
View
2 apiserver/common/setstatus_test.go
@@ -6,14 +6,14 @@ package common_test
import (
"fmt"
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
type statusSetterSuite struct{}
View
3 apiserver/common/unitswatcher.go
@@ -5,10 +5,11 @@ package common
import (
"github.com/juju/errors"
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
"github.com/juju/juju/state/watcher"
- "github.com/juju/names"
)
// UnitsWatcher implements a common WatchUnits method for use by
View
3 apiserver/common/watch.go
@@ -5,10 +5,11 @@ package common
import (
"github.com/juju/errors"
+ "github.com/juju/names"
+
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
"github.com/juju/juju/state/watcher"
- "github.com/juju/names"
)
// AgentEntityWatcher implements a common Watch method for use by
View
2 apiserver/common/watch_test.go
@@ -6,14 +6,14 @@ package common_test
import (
"fmt"
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/state"
- "github.com/juju/names"
)
type agentEntityWatcherSuite struct{}
View
3 apiserver/diskformatter/state.go
@@ -4,8 +4,9 @@
package diskformatter
import (
- "github.com/juju/juju/state"
"github.com/juju/names"
+
+ "github.com/juju/juju/state"
)
type stateInterface interface {
View
7 apiserver/environmentmanager/environmentmanager_test.go
@@ -16,17 +16,16 @@ import (
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/config"
jujutesting "github.com/juju/juju/juju/testing"
- "github.com/juju/juju/state"
- coretesting "github.com/juju/juju/testing"
- "github.com/juju/juju/version"
-
// Register the providers for the field check test
_ "github.com/juju/juju/provider/azure"
_ "github.com/juju/juju/provider/ec2"
_ "github.com/juju/juju/provider/joyent"
_ "github.com/juju/juju/provider/local"
_ "github.com/juju/juju/provider/maas"
_ "github.com/juju/juju/provider/openstack"
+ "github.com/juju/juju/state"
+ coretesting "github.com/juju/juju/testing"
+ "github.com/juju/juju/version"
)
type envManagerSuite struct {
View
3 apiserver/machine/machiner_test.go
@@ -4,11 +4,10 @@
package machine_test
import (
+ "github.com/juju/names"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
- "github.com/juju/names"
-
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/machine"
"github.com/juju/juju/apiserver/params"
View
3 apiserver/storage/state.go
@@ -4,8 +4,9 @@
package storage
import (
- "github.com/juju/juju/state"
"github.com/juju/names"
+
+ "github.com/juju/juju/state"
)
type storageAccess interface {
View
2 apiserver/storage/storage.go
@@ -4,9 +4,9 @@
package storage
import (
+ "github.com/juju/errors"
"github.com/juju/names"
- "github.com/juju/errors"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/feature"
Oops, something went wrong.