From 7822867ed0500390ae757829482d16b9c0b06a3a Mon Sep 17 00:00:00 2001 From: Windfarer Date: Sat, 12 Oct 2019 12:02:47 +0800 Subject: [PATCH 1/3] upgrade docker compose --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7db0c057c..bc54b3b56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,13 @@ env: - DEPLOY_ENV=dev - DISCOVERY_NODES=127.0.0.1:7171 - HTTP_PERF=tcp://0.0.0.0:0 + - DOCKER_COMPOSE_VERSION=1.24.1 + +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin # Skip the install step. Don't `go get` dependencies. Only build with the code # in vendor/ From 64f282161a9d4f354f47861824d30ef755c51801 Mon Sep 17 00:00:00 2001 From: Windfarer Date: Sat, 12 Oct 2019 12:15:56 +0800 Subject: [PATCH 2/3] enable docker --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index bc54b3b56..876b8d537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ language: go go: - 1.12.x +services: + - docker + # Only clone the most recent commit. git: depth: 1 From 76993518734e968a16e187d686e7f836266a647b Mon Sep 17 00:00:00 2001 From: Windfarer Date: Sat, 12 Oct 2019 13:52:57 +0800 Subject: [PATCH 3/3] fix sample test --- pkg/net/trace/sample_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/net/trace/sample_test.go b/pkg/net/trace/sample_test.go index 7ccd01b36..329ec5f16 100644 --- a/pkg/net/trace/sample_test.go +++ b/pkg/net/trace/sample_test.go @@ -21,8 +21,8 @@ func TestProbabilitySampling(t *testing.T) { count++ } } - if count < 60 || count > 120 { - t.Errorf("expect count between 60~120 get %d", count) + if count < 60 || count > 150 { + t.Errorf("expect count between 60~150 get %d", count) } }) }