Browse code
test: fix trivial code convention noncompliance
daemon/events/testutils: rename eventstestutils to testutils
volume/testutils: rename volumetestutils to testutils
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Akihiro Suda authored on 2016/09/12 16:34:19Showing 7 changed files
- daemon/events/events_test.go
- daemon/events/testutils/testutils.go
- integration-cli/docker_cli_events_test.go
- integration-cli/events_utils.go
- volume/drivers/extpoint_test.go
- volume/store/store_test.go
- volume/testutils/testutils.go
| ... | ... |
@@ -7,7 +7,7 @@ import ( |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/api/types/events" |
| 9 | 9 |
timetypes "github.com/docker/docker/api/types/time" |
| 10 |
- "github.com/docker/docker/daemon/events/testutils" |
|
| 10 |
+ eventstestutils "github.com/docker/docker/daemon/events/testutils" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestEventsLog(t *testing.T) {
|
| ... | ... |
@@ -11,7 +11,7 @@ import ( |
| 11 | 11 |
"sync" |
| 12 | 12 |
"time" |
| 13 | 13 |
|
| 14 |
- "github.com/docker/docker/daemon/events/testutils" |
|
| 14 |
+ eventstestutils "github.com/docker/docker/daemon/events/testutils" |
|
| 15 | 15 |
"github.com/docker/docker/pkg/integration/checker" |
| 16 | 16 |
icmd "github.com/docker/docker/pkg/integration/cmd" |
| 17 | 17 |
"github.com/go-check/check" |
| ... | ... |
@@ -10,7 +10,7 @@ import ( |
| 10 | 10 |
"strings" |
| 11 | 11 |
|
| 12 | 12 |
"github.com/Sirupsen/logrus" |
| 13 |
- "github.com/docker/docker/daemon/events/testutils" |
|
| 13 |
+ eventstestutils "github.com/docker/docker/daemon/events/testutils" |
|
| 14 | 14 |
"github.com/docker/docker/pkg/integration/checker" |
| 15 | 15 |
"github.com/go-check/check" |
| 16 | 16 |
) |
| ... | ... |
@@ -6,11 +6,11 @@ import ( |
| 6 | 6 |
"testing" |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/volume/drivers" |
| 9 |
- vt "github.com/docker/docker/volume/testutils" |
|
| 9 |
+ volumetestutils "github.com/docker/docker/volume/testutils" |
|
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 | 12 |
func TestCreate(t *testing.T) {
|
| 13 |
- volumedrivers.Register(vt.NewFakeDriver("fake"), "fake")
|
|
| 13 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
|
|
| 14 | 14 |
defer volumedrivers.Unregister("fake")
|
| 15 | 15 |
s, err := New("")
|
| 16 | 16 |
if err != nil {
|
| ... | ... |
@@ -39,8 +39,8 @@ func TestCreate(t *testing.T) {
|
| 39 | 39 |
} |
| 40 | 40 |
|
| 41 | 41 |
func TestRemove(t *testing.T) {
|
| 42 |
- volumedrivers.Register(vt.NewFakeDriver("fake"), "fake")
|
|
| 43 |
- volumedrivers.Register(vt.NewFakeDriver("noop"), "noop")
|
|
| 42 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
|
|
| 43 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
|
|
| 44 | 44 |
defer volumedrivers.Unregister("fake")
|
| 45 | 45 |
defer volumedrivers.Unregister("noop")
|
| 46 | 46 |
s, err := New("")
|
| ... | ... |
@@ -50,7 +50,7 @@ func TestRemove(t *testing.T) {
|
| 50 | 50 |
|
| 51 | 51 |
// doing string compare here since this error comes directly from the driver |
| 52 | 52 |
expected := "no such volume" |
| 53 |
- if err := s.Remove(vt.NoopVolume{}); err == nil || !strings.Contains(err.Error(), expected) {
|
|
| 53 |
+ if err := s.Remove(volumetestutils.NoopVolume{}); err == nil || !strings.Contains(err.Error(), expected) {
|
|
| 54 | 54 |
t.Fatalf("Expected error %q, got %v", expected, err)
|
| 55 | 55 |
} |
| 56 | 56 |
|
| ... | ... |
@@ -72,8 +72,8 @@ func TestRemove(t *testing.T) {
|
| 72 | 72 |
} |
| 73 | 73 |
|
| 74 | 74 |
func TestList(t *testing.T) {
|
| 75 |
- volumedrivers.Register(vt.NewFakeDriver("fake"), "fake")
|
|
| 76 |
- volumedrivers.Register(vt.NewFakeDriver("fake2"), "fake2")
|
|
| 75 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
|
|
| 76 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("fake2"), "fake2")
|
|
| 77 | 77 |
defer volumedrivers.Unregister("fake")
|
| 78 | 78 |
defer volumedrivers.Unregister("fake2")
|
| 79 | 79 |
|
| ... | ... |
@@ -111,8 +111,8 @@ func TestList(t *testing.T) {
|
| 111 | 111 |
} |
| 112 | 112 |
|
| 113 | 113 |
func TestFilterByDriver(t *testing.T) {
|
| 114 |
- volumedrivers.Register(vt.NewFakeDriver("fake"), "fake")
|
|
| 115 |
- volumedrivers.Register(vt.NewFakeDriver("noop"), "noop")
|
|
| 114 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
|
|
| 115 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
|
|
| 116 | 116 |
defer volumedrivers.Unregister("fake")
|
| 117 | 117 |
defer volumedrivers.Unregister("noop")
|
| 118 | 118 |
s, err := New("")
|
| ... | ... |
@@ -140,8 +140,8 @@ func TestFilterByDriver(t *testing.T) {
|
| 140 | 140 |
} |
| 141 | 141 |
|
| 142 | 142 |
func TestFilterByUsed(t *testing.T) {
|
| 143 |
- volumedrivers.Register(vt.NewFakeDriver("fake"), "fake")
|
|
| 144 |
- volumedrivers.Register(vt.NewFakeDriver("noop"), "noop")
|
|
| 143 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
|
|
| 144 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
|
|
| 145 | 145 |
|
| 146 | 146 |
s, err := New("")
|
| 147 | 147 |
if err != nil {
|
| ... | ... |
@@ -178,7 +178,7 @@ func TestFilterByUsed(t *testing.T) {
|
| 178 | 178 |
} |
| 179 | 179 |
|
| 180 | 180 |
func TestDerefMultipleOfSameRef(t *testing.T) {
|
| 181 |
- volumedrivers.Register(vt.NewFakeDriver("fake"), "fake")
|
|
| 181 |
+ volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
|
|
| 182 | 182 |
|
| 183 | 183 |
s, err := New("")
|
| 184 | 184 |
if err != nil {
|