support unset GOPATH in Go 1.8 in integrationtests

fixes #415
This commit is contained in:
Marten Seemann
2017-02-18 13:40:28 +07:00
parent 0d6647ed8c
commit bd452b35ca
5 changed files with 14 additions and 36 deletions

View File

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

View File

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

View File

@@ -5,6 +5,7 @@ import (
"crypto/md5"
"encoding/hex"
"fmt"
"go/build"
"io"
"io/ioutil"
"mime/multipart"
@@ -13,6 +14,8 @@ import (
"os"
"os/exec"
"path"
"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())
clientPath = fmt.Sprintf(
"%s/src/github.com/lucas-clemente/quic-clients/client-%s-debug",
build.Default.GOPATH,
runtime.GOOS,
)
})
var _ = AfterEach(func() {

View File

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

View File

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