From e03cc68e3adb8aa584ed7db3cd70084fac0a2c4f Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 12 Sep 2016 07:34:19 +0000 Subject: [PATCH] test: fix trivial code convention noncompliance daemon/events/testutils: rename eventstestutils to testutils volume/testutils: rename volumetestutils to testutils Signed-off-by: Akihiro Suda --- daemon/events/events_test.go | 2 +- daemon/events/testutils/testutils.go | 2 +- integration-cli/docker_cli_events_test.go | 2 +- integration-cli/events_utils.go | 2 +- volume/drivers/extpoint_test.go | 2 +- volume/store/store_test.go | 24 +++++++++++------------ volume/testutils/testutils.go | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/daemon/events/events_test.go b/daemon/events/events_test.go index 2c19f1832a..bbd160f901 100644 --- a/daemon/events/events_test.go +++ b/daemon/events/events_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/api/types/events" timetypes "github.com/docker/docker/api/types/time" - "github.com/docker/docker/daemon/events/testutils" + eventstestutils "github.com/docker/docker/daemon/events/testutils" ) func TestEventsLog(t *testing.T) { diff --git a/daemon/events/testutils/testutils.go b/daemon/events/testutils/testutils.go index 56db396bbf..3544446e18 100644 --- a/daemon/events/testutils/testutils.go +++ b/daemon/events/testutils/testutils.go @@ -1,4 +1,4 @@ -package eventstestutils +package testutils import ( "fmt" diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index c47f234339..b6e9988703 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/docker/docker/daemon/events/testutils" + eventstestutils "github.com/docker/docker/daemon/events/testutils" "github.com/docker/docker/pkg/integration/checker" icmd "github.com/docker/docker/pkg/integration/cmd" "github.com/go-check/check" diff --git a/integration-cli/events_utils.go b/integration-cli/events_utils.go index d0863154b6..ba241796b3 100644 --- a/integration-cli/events_utils.go +++ b/integration-cli/events_utils.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/docker/docker/daemon/events/testutils" + eventstestutils "github.com/docker/docker/daemon/events/testutils" "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/volume/drivers/extpoint_test.go b/volume/drivers/extpoint_test.go index 26c06954ee..f96b3104b2 100644 --- a/volume/drivers/extpoint_test.go +++ b/volume/drivers/extpoint_test.go @@ -3,7 +3,7 @@ package volumedrivers import ( "testing" - "github.com/docker/docker/volume/testutils" + volumetestutils "github.com/docker/docker/volume/testutils" ) func TestGetDriver(t *testing.T) { diff --git a/volume/store/store_test.go b/volume/store/store_test.go index 4f3e3cbdf1..089c14f8a2 100644 --- a/volume/store/store_test.go +++ b/volume/store/store_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/docker/docker/volume/drivers" - vt "github.com/docker/docker/volume/testutils" + volumetestutils "github.com/docker/docker/volume/testutils" ) func TestCreate(t *testing.T) { - volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") + volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake") defer volumedrivers.Unregister("fake") s, err := New("") if err != nil { @@ -39,8 +39,8 @@ func TestCreate(t *testing.T) { } func TestRemove(t *testing.T) { - volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") - volumedrivers.Register(vt.NewFakeDriver("noop"), "noop") + volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake") + volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop") defer volumedrivers.Unregister("fake") defer volumedrivers.Unregister("noop") s, err := New("") @@ -50,7 +50,7 @@ func TestRemove(t *testing.T) { // doing string compare here since this error comes directly from the driver expected := "no such volume" - if err := s.Remove(vt.NoopVolume{}); err == nil || !strings.Contains(err.Error(), expected) { + if err := s.Remove(volumetestutils.NoopVolume{}); err == nil || !strings.Contains(err.Error(), expected) { t.Fatalf("Expected error %q, got %v", expected, err) } @@ -72,8 +72,8 @@ func TestRemove(t *testing.T) { } func TestList(t *testing.T) { - volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") - volumedrivers.Register(vt.NewFakeDriver("fake2"), "fake2") + volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake") + volumedrivers.Register(volumetestutils.NewFakeDriver("fake2"), "fake2") defer volumedrivers.Unregister("fake") defer volumedrivers.Unregister("fake2") @@ -111,8 +111,8 @@ func TestList(t *testing.T) { } func TestFilterByDriver(t *testing.T) { - volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") - volumedrivers.Register(vt.NewFakeDriver("noop"), "noop") + volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake") + volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop") defer volumedrivers.Unregister("fake") defer volumedrivers.Unregister("noop") s, err := New("") @@ -140,8 +140,8 @@ func TestFilterByDriver(t *testing.T) { } func TestFilterByUsed(t *testing.T) { - volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") - volumedrivers.Register(vt.NewFakeDriver("noop"), "noop") + volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake") + volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop") s, err := New("") if err != nil { @@ -178,7 +178,7 @@ func TestFilterByUsed(t *testing.T) { } func TestDerefMultipleOfSameRef(t *testing.T) { - volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") + volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake") s, err := New("") if err != nil { diff --git a/volume/testutils/testutils.go b/volume/testutils/testutils.go index 30850d00bd..2dbac02fdb 100644 --- a/volume/testutils/testutils.go +++ b/volume/testutils/testutils.go @@ -1,4 +1,4 @@ -package volumetestutils +package testutils import ( "fmt"