Move test & fs

This commit is contained in:
Jonathan Lange
2016-12-06 17:41:08 +00:00
parent e8085b01b6
commit b5c750ddea
6 changed files with 7 additions and 6 deletions

View File

@@ -11,9 +11,9 @@ import (
"testing"
"github.com/weaveworks/common/exec"
testExec "github.com/weaveworks/common/test/exec"
"github.com/weaveworks/scope/common/weave"
"github.com/weaveworks/scope/test"
testExec "github.com/weaveworks/scope/test/exec"
)
const (

View File

@@ -8,8 +8,8 @@ import (
"time"
"github.com/weaveworks/common/exec"
testexec "github.com/weaveworks/common/test/exec"
"github.com/weaveworks/scope/test"
testexec "github.com/weaveworks/scope/test/exec"
)
const conntrackCloseTag = "</conntrack>\n"

View File

@@ -8,8 +8,8 @@ import (
"time"
fs_hook "github.com/weaveworks/common/fs"
"github.com/weaveworks/common/test/fs"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/test/fs"
)
var mockFS = fs.Dir("",

View File

@@ -19,11 +19,11 @@ import (
"github.com/ugorji/go/codec"
fs_hook "github.com/weaveworks/common/fs"
"github.com/weaveworks/common/test/fs"
"github.com/weaveworks/scope/common/xfer"
"github.com/weaveworks/scope/probe/controls"
"github.com/weaveworks/scope/report"
"github.com/weaveworks/scope/test"
"github.com/weaveworks/scope/test/fs"
"github.com/weaveworks/scope/test/reflect"
)

View File

@@ -5,9 +5,9 @@ import (
"testing"
fs_hook "github.com/weaveworks/common/fs"
"github.com/weaveworks/common/test/fs"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/test"
"github.com/weaveworks/scope/test/fs"
)
var mockFS = fs.Dir("",

View File

@@ -5,6 +5,7 @@ import (
"testing"
"time"
"github.com/weaveworks/common/test"
"github.com/weaveworks/scope/test/reflect"
)
@@ -23,6 +24,6 @@ func Poll(t *testing.T, d time.Duration, want interface{}, have func() interface
h := have()
if !reflect.DeepEqual(want, h) {
_, file, line, _ := runtime.Caller(1)
t.Fatalf("%s:%d: %s", file, line, Diff(want, h))
t.Fatalf("%s:%d: %s", file, line, test.Diff(want, h))
}
}