mirror of
https://github.com/weaveworks/scope.git
synced 2026-07-27 01:01:44 +00:00
Move test & fs
This commit is contained in:
@@ -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 (
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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("",
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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("",
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user