Merge pull request #72 from rosenhouse/move-echosvr

testing: move echosvr into testutils

pkg/testutils/echosvr/echosvr_test.go

@@ -16,7 +16,7 @@ import (
 var binaryPath string
 
 var _ = SynchronizedBeforeSuite(func() []byte {
-	binaryPath, err := gexec.Build("github.com/containernetworking/plugins/plugins/meta/portmap/echosvr")
+	binaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echosvr")
 	Expect(err).NotTo(HaveOccurred())
 	return []byte(binaryPath)
 }, func(data []byte) {

pkg/testutils/echosvr/init_test.go

@@ -9,5 +9,5 @@ import (
 
 func TestEchosvr(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Echosvr Suite")
+	RunSpecs(t, "Testutils Echosvr Suite")
 }

pkg/testutils/echosvr/main.go

@@ -1,3 +1,9 @@
+// Echosvr is a simple TCP echo server
+//
+// It prints its listen address on stdout
+//    127.0.0.1:xxxxx
+//  A test should wait for this line, parse it
+//  and may then attempt to connect.
 package main
 
 import (

plugins/meta/portmap/portmap_suite_test.go

@@ -43,7 +43,7 @@ func TestPortmap(t *testing.T) {
 var echoServerBinaryPath string
 
 var _ = SynchronizedBeforeSuite(func() []byte {
-	binaryPath, err := gexec.Build("github.com/containernetworking/plugins/plugins/meta/portmap/echosvr")
+	binaryPath, err := gexec.Build("github.com/containernetworking/plugins/pkg/testutils/echosvr")
 	Expect(err).NotTo(HaveOccurred())
 	return []byte(binaryPath)
 }, func(data []byte) {