From b77f025c5747dde6a9da874b49f26ec1e07bdc3b Mon Sep 17 00:00:00 2001 From: joshblakeley Date: Thu, 9 Aug 2018 11:23:26 +0100 Subject: [PATCH 1/5] slightly change test to stop race --- gateway_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gateway_test.go b/gateway_test.go index a4cf73cf066..23a80181478 100644 --- a/gateway_test.go +++ b/gateway_test.go @@ -1338,14 +1338,14 @@ func TestRateLimitForAPIAndRateLimitAndQuotaCheck(t *testing.T) { spec.DisableRateLimit = false spec.OrgID = "default" spec.GlobalRateLimit = apidef.GlobalRateLimit{ - Per: 2, - Rate: 60, + Per: 60, + Rate: 4, } spec.Proxy.ListenPath = "/" }) sess1token := createSession(func(s *user.SessionState) { - s.Rate = 1 + s.Rate = 3 s.Per = 60 }) From 3f4ca2f4a0a52c07667e117a49d8559c8a676219 Mon Sep 17 00:00:00 2001 From: joshblakeley Date: Thu, 9 Aug 2018 12:35:20 +0100 Subject: [PATCH 2/5] slightly change test to stop race --- gateway_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gateway_test.go b/gateway_test.go index 23a80181478..9a2c6e5ddc2 100644 --- a/gateway_test.go +++ b/gateway_test.go @@ -1338,14 +1338,14 @@ func TestRateLimitForAPIAndRateLimitAndQuotaCheck(t *testing.T) { spec.DisableRateLimit = false spec.OrgID = "default" spec.GlobalRateLimit = apidef.GlobalRateLimit{ + Rate: 2, Per: 60, - Rate: 4, } spec.Proxy.ListenPath = "/" }) sess1token := createSession(func(s *user.SessionState) { - s.Rate = 3 + s.Rate = 1 s.Per = 60 }) From 5fec0f821d998fdd79395e4c4243f78871420bb7 Mon Sep 17 00:00:00 2001 From: Leonid Bugaev Date: Fri, 10 Aug 2018 16:56:43 +0500 Subject: [PATCH 3/5] Remove jq tests from travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1b6845b484..7b4f4a86179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ env: addons: apt: - sources: - - sourceline: 'ppa:opencpu/jq' packages: - python3.5 - python3-pip @@ -39,7 +37,7 @@ install: script: - sudo pip3 install google - sudo pip3 install protobuf - - go build -tags 'coprocess python jq' + - go build -tags 'coprocess python' - go build -tags 'coprocess lua' - go build -tags 'coprocess grpc' - ./utils/ci-test.sh From ef4655d24d7187e5e453446c0a1e03b3cdecd5d7 Mon Sep 17 00:00:00 2001 From: Leonid Bugaev Date: Fri, 10 Aug 2018 17:02:05 +0500 Subject: [PATCH 4/5] Fix typo --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b4f4a86179..4eb39ef8c11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ addons: - python3.5 - python3-pip - libluajit-5.1-dev - - libjq-dev matrix: include: From 9c999b192fe7ffb73b81fe706dd6526bd09aa818 Mon Sep 17 00:00:00 2001 From: Leonid Bugaev Date: Fri, 10 Aug 2018 17:14:40 +0500 Subject: [PATCH 5/5] Remove jqtests from ci-test.sh --- utils/ci-test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/ci-test.sh b/utils/ci-test.sh index 50adbd44637..2b3ab4c8297 100755 --- a/utils/ci-test.sh +++ b/utils/ci-test.sh @@ -3,7 +3,6 @@ set -e MATRIX=( - "-tags 'jq'" "-tags 'coprocess python'" "-tags 'coprocess grpc'" )