Skip to content

Commit 844d00f

Browse files
jameineljameinel
committed
Start changing the imports of the middle level files.
1 parent 54cb931 commit 844d00f

File tree

139 files changed

+412
-179
lines changed

Some content is hidden

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

139 files changed

+412
-179
lines changed

‎CONTRIBUTING

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,29 @@ You can also list any branches you are currently working on by
6868

6969
bzr branch
7070

71+
72+
Imports
73+
-------
74+
75+
Import statements are grouped into 3 sections: standard library, 3rd party
76+
libraries, juju-core imports. The tool "go fmt" can be used to ensure each
77+
group is alphabetically sorted. eg:
78+
79+
import (
80+
"fmt"
81+
"time"
82+
83+
"labix.org/v2/mgo"
84+
gc "launchpad.net/gocheck"
85+
"launchpad.net/loggo"
86+
87+
"launchpad.net/juju-core/state"
88+
"launchpad.net/juju-core/worker"
89+
)
90+
91+
Because "launchpad.net/gocheck" will be referenced frequently in test suites,
92+
its name gets a default short name of just "gc".
93+
7194
Testing
7295
=======
7396

‎bzr/bzr_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
package bzr_test
55

66
import (
7-
. "launchpad.net/gocheck"
8-
"launchpad.net/juju-core/bzr"
97
"os"
108
"os/exec"
119
"testing"
10+
11+
. "launchpad.net/gocheck"
12+
13+
"launchpad.net/juju-core/bzr"
1214
)
1315

1416
func Test(t *testing.T) {

‎cert/cert_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ import (
1111
"fmt"
1212
"io"
1313
"io/ioutil"
14-
. "launchpad.net/gocheck"
15-
"launchpad.net/juju-core/cert"
1614
"net"
1715
"strings"
1816
"testing"
1917
"time"
18+
19+
. "launchpad.net/gocheck"
20+
21+
"launchpad.net/juju-core/cert"
2022
)
2123

2224
func TestAll(t *testing.T) {

‎charm/bundle_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ import (
88
"bytes"
99
"fmt"
1010
"io/ioutil"
11-
. "launchpad.net/gocheck"
12-
"launchpad.net/goyaml"
13-
"launchpad.net/juju-core/charm"
14-
"launchpad.net/juju-core/testing"
1511
"os"
1612
"os/exec"
1713
"path/filepath"
1814
"strconv"
1915
"syscall"
16+
17+
. "launchpad.net/gocheck"
18+
"launchpad.net/goyaml"
19+
20+
"launchpad.net/juju-core/charm"
21+
"launchpad.net/juju-core/testing"
2022
)
2123

2224
type BundleSuite struct {

‎charm/charm_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ import (
77
"bytes"
88
"io"
99
"io/ioutil"
10+
stdtesting "testing"
11+
1012
. "launchpad.net/gocheck"
1113
"launchpad.net/goyaml"
14+
1215
"launchpad.net/juju-core/charm"
1316
"launchpad.net/juju-core/testing"
14-
stdtesting "testing"
1517
)
1618

1719
func Test(t *stdtesting.T) {

‎charm/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"strconv"
1111

1212
"launchpad.net/goyaml"
13+
1314
"launchpad.net/juju-core/schema"
1415
)
1516

‎charm/config_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ package charm_test
66
import (
77
"bytes"
88
"fmt"
9+
910
. "launchpad.net/gocheck"
11+
1012
"launchpad.net/juju-core/charm"
1113
)
1214

‎charm/dir.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import (
99
"fmt"
1010
"io"
1111
"io/ioutil"
12-
"launchpad.net/juju-core/log"
1312
"os"
1413
"path/filepath"
1514
"strconv"
1615
"syscall"
16+
17+
"launchpad.net/juju-core/log"
1718
)
1819

1920
// The Dir type encapsulates access to data and operations

‎charm/dir_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ import (
88
"bytes"
99
"fmt"
1010
"io/ioutil"
11-
. "launchpad.net/gocheck"
12-
"launchpad.net/juju-core/charm"
13-
"launchpad.net/juju-core/testing"
1411
"os"
1512
"path/filepath"
1613
"strings"
1714
"syscall"
15+
16+
. "launchpad.net/gocheck"
17+
18+
"launchpad.net/juju-core/charm"
19+
"launchpad.net/juju-core/testing"
1820
)
1921

2022
type DirSuite struct {

‎charm/meta.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ import (
88
"fmt"
99
"io"
1010
"io/ioutil"
11+
"strings"
12+
1113
"launchpad.net/goyaml"
14+
1215
"launchpad.net/juju-core/charm/hooks"
1316
"launchpad.net/juju-core/schema"
14-
"strings"
1517
)
1618

1719
// RelationScope describes the scope of a relation.

‎charm/meta_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ import (
77
"bytes"
88
"io"
99
"io/ioutil"
10-
. "launchpad.net/gocheck"
11-
"launchpad.net/juju-core/charm"
12-
"launchpad.net/juju-core/testing"
1310
"os"
1411
"path/filepath"
1512
"strings"
13+
14+
. "launchpad.net/gocheck"
15+
16+
"launchpad.net/juju-core/charm"
17+
"launchpad.net/juju-core/testing"
1618
)
1719

1820
func repoMeta(name string) io.Reader {

‎charm/repo.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ import (
1010
"fmt"
1111
"io"
1212
"io/ioutil"
13-
"launchpad.net/juju-core/log"
1413
"net/http"
1514
"net/url"
1615
"os"
1716
"path/filepath"
1817
"strings"
18+
19+
"launchpad.net/juju-core/log"
1920
)
2021

2122
// CacheDir stores the charm cache directory path.

‎charm/repo_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ import (
99
"encoding/json"
1010
"fmt"
1111
"io/ioutil"
12-
. "launchpad.net/gocheck"
13-
"launchpad.net/juju-core/charm"
14-
"launchpad.net/juju-core/testing"
1512
"net"
1613
"net/http"
1714
"os"
1815
"path/filepath"
1916
"strconv"
2017
"strings"
18+
19+
. "launchpad.net/gocheck"
20+
21+
"launchpad.net/juju-core/charm"
22+
"launchpad.net/juju-core/testing"
2123
)
2224

2325
type MockStore struct {

‎charm/url.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ package charm
66
import (
77
"encoding/json"
88
"fmt"
9-
"labix.org/v2/mgo/bson"
109
"regexp"
1110
"strconv"
1211
"strings"
12+
13+
"labix.org/v2/mgo/bson"
1314
)
1415

1516
// A charm URL represents charm locations such as:

‎charm/url_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ package charm_test
66
import (
77
"encoding/json"
88
"fmt"
9+
910
"labix.org/v2/mgo/bson"
1011
. "launchpad.net/gocheck"
12+
1113
"launchpad.net/juju-core/charm"
1214
)
1315

‎cloudinit/cloudinit_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ package cloudinit_test
55

66
import (
77
"fmt"
8+
"testing"
9+
810
. "launchpad.net/gocheck"
11+
912
"launchpad.net/juju-core/cloudinit"
10-
"testing"
1113
)
1214

1315
// TODO integration tests, but how?

‎cmd/builddb/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import (
99
"path/filepath"
1010
"time"
1111

12+
"launchpad.net/loggo"
13+
1214
"launchpad.net/juju-core/charm"
1315
"launchpad.net/juju-core/environs"
1416
"launchpad.net/juju-core/juju"
1517
"launchpad.net/juju-core/state/api/params"
16-
"launchpad.net/loggo"
1718
)
1819

1920
// Import the providers.

‎cmd/charmd/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ package main
66
import (
77
"fmt"
88
"io/ioutil"
9-
"launchpad.net/goyaml"
10-
"launchpad.net/juju-core/store"
119
"net/http"
1210
"os"
1311
"path/filepath"
12+
13+
"launchpad.net/goyaml"
14+
15+
"launchpad.net/juju-core/store"
1416
)
1517

1618
func main() {

‎cmd/cmd.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import (
99
"fmt"
1010
"io"
1111
"io/ioutil"
12-
"launchpad.net/gnuflag"
1312
"os"
1413
"path/filepath"
1514
"strings"
15+
16+
"launchpad.net/gnuflag"
1617
)
1718

1819
// ErrSilent can be returned from Run to signal that Main should exit with

‎cmd/cmd_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ package cmd_test
55

66
import (
77
"bytes"
8+
"path/filepath"
9+
stdtesting "testing"
10+
811
. "launchpad.net/gocheck"
12+
913
"launchpad.net/juju-core/cmd"
1014
"launchpad.net/juju-core/testing"
11-
"path/filepath"
12-
stdtesting "testing"
1315
)
1416

1517
func Test(t *stdtesting.T) { TestingT(t) }

‎cmd/filevar_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
package cmd_test
55

66
import (
7+
"os"
8+
79
"launchpad.net/gnuflag"
810
. "launchpad.net/gocheck"
11+
912
"launchpad.net/juju-core/cmd"
1013
"launchpad.net/juju-core/testing"
11-
"os"
1214
)
1315

1416
type FileVarSuite struct {

‎cmd/logging_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ import (
88
"path/filepath"
99

1010
. "launchpad.net/gocheck"
11+
"launchpad.net/loggo"
12+
1113
"launchpad.net/juju-core/cmd"
1214
"launchpad.net/juju-core/log"
1315
"launchpad.net/juju-core/testing"
14-
"launchpad.net/loggo"
1516
)
1617

1718
type LogSuite struct {

‎cmd/output.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ import (
77
"encoding/json"
88
"fmt"
99
"io"
10-
"launchpad.net/gnuflag"
11-
"launchpad.net/goyaml"
1210
"os"
1311
"reflect"
1412
"sort"
1513
"strings"
14+
15+
"launchpad.net/gnuflag"
16+
"launchpad.net/goyaml"
1617
)
1718

1819
// Formatter converts an arbitrary object into a []byte.

‎cmd/output_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package cmd_test
66
import (
77
"launchpad.net/gnuflag"
88
. "launchpad.net/gocheck"
9+
910
"launchpad.net/juju-core/cmd"
1011
"launchpad.net/juju-core/testing"
1112
)

‎cmd/supercommand.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"strings"
1111

1212
"launchpad.net/gnuflag"
13+
1314
"launchpad.net/juju-core/log"
1415
)
1516

‎cmd/supercommand_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"fmt"
88

99
. "launchpad.net/gocheck"
10+
1011
"launchpad.net/juju-core/cmd"
1112
"launchpad.net/juju-core/testing"
1213
)

‎cmd/util_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import (
88
"errors"
99
"fmt"
1010
"io"
11+
1112
"launchpad.net/gnuflag"
13+
1214
"launchpad.net/juju-core/cmd"
1315
)
1416

0 commit comments

Comments
 (0)