Merge pull request #428 from lucas-clemente/fix-415

support unset GOPATH in Go 1.8 in integrationtests

integrationtests/drop_test.go

@@ -3,9 +3,7 @@ package integrationtests
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"os/exec"
-	"runtime"
 	"strconv"
 	"time"
 
@@ -28,12 +26,6 @@ var _ = Describe("Drop Proxy", func() {
 	runDropTest := func(incomingPacketDropper, outgoingPacketDropper proxy.DropCallback, version protocol.VersionNumber) {
 		proxyPort := 12345
 
-		clientPath := fmt.Sprintf(
-			"%s/src/github.com/lucas-clemente/quic-clients/client-%s-debug",
-			os.Getenv("GOPATH"),
-			runtime.GOOS,
-		)
-
 		iPort, _ := strconv.Atoi(port)
 		var err error
 		dropproxy, err = proxy.NewUDPProxy(proxyPort, "localhost", iPort, incomingPacketDropper, outgoingPacketDropper, 0, 0)

integrationtests/integration_test.go

@@ -3,9 +3,7 @@ package integrationtests
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"os/exec"
-	"runtime"
 	"strconv"
 	"sync"
 
@@ -24,12 +22,6 @@ var _ = Describe("Integration tests", func() {
 		dataMan.GenerateData(dataLen)
 	})
 
-	clientPath := fmt.Sprintf(
-		"%s/src/github.com/lucas-clemente/quic-clients/client-%s-debug",
-		os.Getenv("GOPATH"),
-		runtime.GOOS,
-	)
-
 	for i := range protocol.SupportedVersions {
 		version := protocol.SupportedVersions[i]
 

integrationtests/integrationtests_suite_test.go

@@ -13,6 +13,9 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
+	"runtime"
+
 	"strconv"
 	"time"
 
@@ -35,10 +38,11 @@ const (
 )
 
 var (
-	server    *h2quic.Server
-	dataMan   dataManager
-	port      string
-	uploadDir string
+	server     *h2quic.Server
+	dataMan    dataManager
+	port       string
+	uploadDir  string
+	clientPath string
 
 	docker *gexec.Session
 )
@@ -68,6 +72,12 @@ var _ = BeforeEach(func() {
 	Expect(err).ToNot(HaveOccurred())
 	err = os.MkdirAll(uploadDir, os.ModeDir|0777)
 	Expect(err).ToNot(HaveOccurred())
+
+	_, thisfile, _, ok := runtime.Caller(0)
+	if !ok {
+		Fail("Failed to get current path")
+	}
+	clientPath = filepath.Join(thisfile, fmt.Sprintf("../../../quic-clients/client-%s-debug", runtime.GOOS))
 })
 
 var _ = AfterEach(func() {

integrationtests/random_rtt_test.go

@@ -3,9 +3,7 @@ package integrationtests
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"os/exec"
-	"runtime"
 	"strconv"
 	"time"
 
@@ -28,12 +26,6 @@ var _ = Describe("Random RTT", func() {
 	runRTTTest := func(minRtt, maxRtt time.Duration, version protocol.VersionNumber) {
 		proxyPort := 12345
 
-		clientPath := fmt.Sprintf(
-			"%s/src/github.com/lucas-clemente/quic-clients/client-%s-debug",
-			os.Getenv("GOPATH"),
-			runtime.GOOS,
-		)
-
 		iPort, _ := strconv.Atoi(port)
 		var err error
 		rttProxy, err = proxy.NewUDPProxy(proxyPort, "localhost", iPort, nil, nil, minRtt, maxRtt)

integrationtests/rtt_test.go

@@ -3,9 +3,7 @@ package integrationtests
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"os/exec"
-	"runtime"
 	"strconv"
 	"time"
 
@@ -28,12 +26,6 @@ var _ = Describe("non-zero RTT", func() {
 	runRTTTest := func(rtt time.Duration, version protocol.VersionNumber) {
 		proxyPort := 12345
 
-		clientPath := fmt.Sprintf(
-			"%s/src/github.com/lucas-clemente/quic-clients/client-%s-debug",
-			os.Getenv("GOPATH"),
-			runtime.GOOS,
-		)
-
 		iPort, _ := strconv.Atoi(port)
 		var err error
 		rttProxy, err = proxy.NewUDPProxy(proxyPort, "localhost", iPort, nil, nil, rtt, rtt)