Merge 9c999b1 into f9a2000

TykTechnologies · Aug 12, 2018 · 9976f5d · 9976f5d
2 parents f9a2000 + 9c999b1
commit 9976f5d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,13 +11,10 @@ env:
 
 addons:
   apt:
-    sources:
-    - sourceline: 'ppa:opencpu/jq'
     packages:
     - python3.5
     - python3-pip
     - libluajit-5.1-dev
-    - libjq-dev
 
 matrix:
   include:
@@ -39,7 +36,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

diff --git a/gateway_test.go b/gateway_test.go
@@ -1338,8 +1338,8 @@ func TestRateLimitForAPIAndRateLimitAndQuotaCheck(t *testing.T) {
 		spec.DisableRateLimit = false
 		spec.OrgID = "default"
 		spec.GlobalRateLimit = apidef.GlobalRateLimit{
-			Per:  2,
-			Rate: 60,
+			Rate: 2,
+			Per:  60,
 		}
 		spec.Proxy.ListenPath = "/"
 	})

diff --git 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'"
 )