kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #26481 from AkihiroSuda/nit-fix-convention-26467 

[nit] test: fix trivial code convention noncompliance
This commit is contained in:
Vincent Demeester 2016-09-12 15:03:29 +02:00 committed by GitHub
parent 2cce7bf33a e03cc68e3a
commit e391e83804
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/events/events_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
timetypes "github.com/docker/docker/api/types/time" 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) { func TestEventsLog(t *testing.T) {

2
daemon/events/testutils/testutils.go
View File

@ -1,4 +1,4 @@
package eventstestutils package testutils
import ( import (
"fmt" "fmt"

2
integration-cli/docker_cli_events_test.go
View File

@ -11,7 +11,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/docker/docker/daemon/events/testutils" eventstestutils "github.com/docker/docker/daemon/events/testutils"
"github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/integration/checker"
icmd "github.com/docker/docker/pkg/integration/cmd" icmd "github.com/docker/docker/pkg/integration/cmd"
"github.com/go-check/check" "github.com/go-check/check"

2
integration-cli/events_utils.go
View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
"github.com/Sirupsen/logrus" "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/docker/docker/pkg/integration/checker"
"github.com/go-check/check" "github.com/go-check/check"
) )

2
volume/drivers/extpoint_test.go
View File

@ -3,7 +3,7 @@ package volumedrivers
import ( import (
"testing" "testing"
"github.com/docker/docker/volume/testutils" volumetestutils "github.com/docker/docker/volume/testutils"
) )
func TestGetDriver(t *testing.T) { func TestGetDriver(t *testing.T) {

24
volume/store/store_test.go
View File

@ -6,11 +6,11 @@ import (
"testing" "testing"
"github.com/docker/docker/volume/drivers" "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) { func TestCreate(t *testing.T) {
volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
defer volumedrivers.Unregister("fake") defer volumedrivers.Unregister("fake")
s, err := New("") s, err := New("")
if err != nil { if err != nil {
@ -39,8 +39,8 @@ func TestCreate(t *testing.T) {
} }
func TestRemove(t *testing.T) { func TestRemove(t *testing.T) {
volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
volumedrivers.Register(vt.NewFakeDriver("noop"), "noop") volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
defer volumedrivers.Unregister("fake") defer volumedrivers.Unregister("fake")
defer volumedrivers.Unregister("noop") defer volumedrivers.Unregister("noop")
s, err := New("") s, err := New("")
@ -50,7 +50,7 @@ func TestRemove(t *testing.T) {
// doing string compare here since this error comes directly from the driver // doing string compare here since this error comes directly from the driver
expected := "no such volume" 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) t.Fatalf("Expected error %q, got %v", expected, err)
} }
@ -72,8 +72,8 @@ func TestRemove(t *testing.T) {
} }
func TestList(t *testing.T) { func TestList(t *testing.T) {
volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
volumedrivers.Register(vt.NewFakeDriver("fake2"), "fake2") volumedrivers.Register(volumetestutils.NewFakeDriver("fake2"), "fake2")
defer volumedrivers.Unregister("fake") defer volumedrivers.Unregister("fake")
defer volumedrivers.Unregister("fake2") defer volumedrivers.Unregister("fake2")
@ -111,8 +111,8 @@ func TestList(t *testing.T) {
} }
func TestFilterByDriver(t *testing.T) { func TestFilterByDriver(t *testing.T) {
volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
volumedrivers.Register(vt.NewFakeDriver("noop"), "noop") volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
defer volumedrivers.Unregister("fake") defer volumedrivers.Unregister("fake")
defer volumedrivers.Unregister("noop") defer volumedrivers.Unregister("noop")
s, err := New("") s, err := New("")
@ -140,8 +140,8 @@ func TestFilterByDriver(t *testing.T) {
} }
func TestFilterByUsed(t *testing.T) { func TestFilterByUsed(t *testing.T) {
volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
volumedrivers.Register(vt.NewFakeDriver("noop"), "noop") volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
s, err := New("") s, err := New("")
if err != nil { if err != nil {
@ -178,7 +178,7 @@ func TestFilterByUsed(t *testing.T) {
} }
func TestDerefMultipleOfSameRef(t *testing.T) { func TestDerefMultipleOfSameRef(t *testing.T) {
volumedrivers.Register(vt.NewFakeDriver("fake"), "fake") volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
s, err := New("") s, err := New("")
if err != nil { if err != nil {

2
volume/testutils/testutils.go
View File

@ -1,4 +1,4 @@
package volumetestutils package testutils
import ( import (
"fmt" "fmt"