Skip to content

Commit

Permalink
CI: fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
matiasinsaurralde committed Sep 5, 2019
1 parent 1c0df51 commit 8804a05
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
7 changes: 2 additions & 5 deletions bin/ci-test.sh
Expand Up @@ -33,7 +33,7 @@ if [[ ${LATEST_GO} ]]; then
race="-race"
fi

PKGS="$(go list -tags "coprocess python grpc" ./...)"
PKGS="$(go list ./...)"

go get -t

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions dlpython/main_test.go
Expand Up @@ -16,20 +16,20 @@ 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)
}
}

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)
Expand Down
1 change: 0 additions & 1 deletion gateway/testutil.go
Expand Up @@ -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
Expand Down

0 comments on commit 8804a05

Please sign in to comment.