Use test.Diff from common

app/collector_test.go

@@ -7,9 +7,9 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/weaveworks/common/mtime"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/app"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

app/merger_test.go

@@ -5,9 +5,9 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/app"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

app/router_test.go

@@ -13,8 +13,8 @@ import (
 	"github.com/ugorji/go/codec"
 	"golang.org/x/net/context"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/app"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 )
 

common/weave/client_test.go

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

probe/appclient/app_client_internal_test.go

@@ -13,9 +13,9 @@ import (
 
 	"github.com/gorilla/handlers"
 	"github.com/ugorji/go/codec"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 )
 
 func dummyServer(t *testing.T, expectedToken, expectedID string, expectedVersion string, expectedReport report.Report, done chan struct{}) *httptest.Server {

probe/controls/controls_test.go

@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/probe/controls"
-	"github.com/weaveworks/scope/test"
 )
 
 func TestControls(t *testing.T) {

probe/docker/controls_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	commonTest "github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/probe/controls"
 	"github.com/weaveworks/scope/probe/docker"
@@ -92,7 +93,7 @@ func TestPipes(t *testing.T) {
 				NodeID:  report.MakeContainerNodeID("ping"),
 			})
 			if !reflect.DeepEqual(result, want.response) {
-				t.Errorf("diff %s: %s", want.control, test.Diff(want, result))
+				t.Errorf("diff %s: %s", want.control, commonTest.Diff(want, result))
 			}
 		}
 	})

probe/docker/registry_test.go

@@ -12,6 +12,7 @@ import (
 	client "github.com/fsouza/go-dockerclient"
 
 	"github.com/weaveworks/common/mtime"
+	commonTest "github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/controls"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/report"
@@ -496,7 +497,7 @@ func TestRegistryDelete(t *testing.T) {
 				}),
 			}
 			if !reflect.DeepEqual(want, nodes) {
-				t.Errorf("Didn't get right container updates: %v", test.Diff(want, nodes))
+				t.Errorf("Didn't get right container updates: %v", commonTest.Diff(want, nodes))
 			}
 			nodes = []report.Node{}
 			mtx.Unlock()

probe/endpoint/nat_internal_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/weaveworks/common/mtime"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

probe/endpoint/procspy/spy_linux_internal_test.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	fs_hook "github.com/weaveworks/common/fs"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/process"
-	"github.com/weaveworks/scope/test"
 )
 
 func TestLinuxConnections(t *testing.T) {

probe/plugins/registry_internal_test.go

@@ -19,11 +19,11 @@ import (
 	"github.com/ugorji/go/codec"
 
 	fs_hook "github.com/weaveworks/common/fs"
+	"github.com/weaveworks/common/test"
 	"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/reflect"
 )
 

probe/process/walker_linux_test.go

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

probe/process/walker_test.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/process"
-	"github.com/weaveworks/scope/test"
 )
 
 func TestBasicWalk(t *testing.T) {

render/container_test.go

@@ -5,12 +5,12 @@ import (
 	"net"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/probe/process"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/render/expected"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 	"github.com/weaveworks/scope/test/reflect"
 )

render/detailed/metadata_test.go

@@ -4,10 +4,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 )
 

render/detailed/metrics_test.go

@@ -5,12 +5,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/probe/host"
 	"github.com/weaveworks/scope/probe/process"
 	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 )
 

render/detailed/node_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/probe/host"
 	"github.com/weaveworks/scope/probe/kubernetes"
@@ -12,7 +13,6 @@ import (
 	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/render/expected"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 	"github.com/weaveworks/scope/test/reflect"
 )

render/detailed/parents_test.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/render/expected"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 	"github.com/weaveworks/scope/test/reflect"
 )

render/detailed/summary_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/weaveworks/common/mtime"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/probe/host"
 	"github.com/weaveworks/scope/probe/process"
@@ -13,7 +14,6 @@ import (
 	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/render/expected"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 	"github.com/weaveworks/scope/test/reflect"
 )

render/detailed/tables_test.go

@@ -4,10 +4,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 )
 

render/detailed/topology_diff_test.go

@@ -5,9 +5,9 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render/detailed"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 )
 
 // ByID is a sort interface for a NodeSummary slice.

render/filters_test.go

@@ -3,9 +3,9 @@ package render_test
 import (
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

render/host_test.go

@@ -3,9 +3,9 @@ package render_test
 import (
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/render/expected"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 	"github.com/weaveworks/scope/test/reflect"
 )

render/memoise_test.go

@@ -3,9 +3,9 @@ package render_test
 import (
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

render/metrics_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

render/pod_test.go

@@ -3,10 +3,10 @@ package render_test
 import (
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/kubernetes"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/render/expected"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 	"github.com/weaveworks/scope/test/reflect"
 )

render/process_test.go

@@ -3,9 +3,9 @@ package render_test
 import (
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/render/expected"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/fixture"
 	"github.com/weaveworks/scope/test/reflect"
 )

render/render_test.go

@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 )
 
 type mockRenderer struct {

render/theinternet_test.go

@@ -5,10 +5,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/probe/host"
 	"github.com/weaveworks/scope/render"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 )
 
 func TestReportLocalNetworks(t *testing.T) {

report/counters_internal_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ugorji/go/codec"
 
-	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

report/edge_metadatas_internal_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ugorji/go/codec"
 
-	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

report/latest_map_internal_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/ugorji/go/codec"
 
-	"github.com/weaveworks/scope/test"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

report/metrics_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/ugorji/go/codec"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

report/networks_test.go

@@ -4,8 +4,8 @@ import (
 	"net"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

report/node_test.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/weaveworks/common/mtime"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	"github.com/weaveworks/scope/test/reflect"
 )
 

report/report_test.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/weaveworks/common/mtime"
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 	s_reflect "github.com/weaveworks/scope/test/reflect"
 )
 

report/table_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/weaveworks/common/test"
 	"github.com/weaveworks/scope/report"
-	"github.com/weaveworks/scope/test"
 )
 
 func TestPrefixTables(t *testing.T) {