From 8804a05176e3a62a6f04c21c270b98cf2fd225c0 Mon Sep 17 00:00:00 2001
From: Matias Insaurralde <matias@insaurral.de>
Date: Thu, 5 Sep 2019 00:27:07 -0400
Subject: [PATCH] CI: fix tests

---
 bin/ci-test.sh        | 7 ++-----
 dlpython/main_test.go | 6 +++---
 gateway/testutil.go   | 1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/bin/ci-test.sh b/bin/ci-test.sh
index 47d43ef7b61..8dab76446e2 100755
--- a/bin/ci-test.sh
+++ b/bin/ci-test.sh
@@ -33,7 +33,7 @@ if [[ ${LATEST_GO} ]]; then
     race="-race"
 fi
 
-PKGS="$(go list -tags "coprocess python grpc" ./...)"
+PKGS="$(go list ./...)"
 
 go get -t
 
@@ -47,10 +47,7 @@ for pkg in $PKGS; do
 
     # TODO: Remove skipRace variable after solving race conditions in tests.
     skipRace=false
-    if [[ ${pkg} == *"coprocess" ]]; then
-        tags="-tags 'coprocess'"
-        skipRace=true
-    elif [[ ${pkg} == *"goplugin" ]]; then
+    if [[ ${pkg} == *"goplugin" ]]; then
         tags="-tags 'goplugin'"
     fi
 
diff --git a/dlpython/main_test.go b/dlpython/main_test.go
index eb7ac9e385e..f949d78113b 100644
--- a/dlpython/main_test.go
+++ b/dlpython/main_test.go
@@ -16,12 +16,12 @@ func init() {
 }
 
 func TestFindPythonConfig(t *testing.T) {
-	err := FindPythonConfig("0.0")
+	_, err := FindPythonConfig("0.0")
 	t.Logf("Library path is %s", pythonLibraryPath)
 	if err == nil {
 		t.Fatal("Should fail when loading a nonexistent Python version")
 	}
-	err = FindPythonConfig(testVersion)
+	_, err = FindPythonConfig(testVersion)
 	t.Logf("Library path is %s", pythonLibraryPath)
 	if err != nil {
 		t.Fatalf("Couldn't find Python %s", testVersion)
@@ -29,7 +29,7 @@ func TestFindPythonConfig(t *testing.T) {
 }
 
 func TestInit(t *testing.T) {
-	err := FindPythonConfig(testVersion)
+	_, err := FindPythonConfig(testVersion)
 	t.Logf("Library path is %s", pythonLibraryPath)
 	if err != nil {
 		t.Fatalf("Couldn't find Python %s", testVersion)
diff --git a/gateway/testutil.go b/gateway/testutil.go
index cb79b672b1e..f2456fe0a7d 100644
--- a/gateway/testutil.go
+++ b/gateway/testutil.go
@@ -92,7 +92,6 @@ func InitTestMain(ctx context.Context, m *testing.M, genConf ...func(globalConf
 	globalConf.AllowInsecureConfigs = true
 	// Enable coprocess and bundle downloader:
 	globalConf.CoProcessOptions.EnableCoProcess = true
-	globalConf.CoProcessOptions.PythonPathPrefix = "../../"
 	globalConf.EnableBundleDownloader = true
 	globalConf.BundleBaseURL = testHttpBundles
 	globalConf.MiddlewarePath = testMiddlewarePath