testing: move echosvr into testutils

This commit is contained in:
Gabriel Rosenhouse
2017-09-06 19:10:20 -07:00
parent 1396ab0bab
commit d8f2fd7a3c
4 changed files with 9 additions and 3 deletions

View File

@ -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) {

View File

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

View File

@ -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 (

View File

@ -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) {