Skip to content

Commit

Permalink
fix linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Tieske committed Sep 12, 2016
1 parent ee654dd commit 42277d1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion kong/core/balancer.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
local utils = require "kong.tools.utils"
local dns_client = require "dns.client"

local toip = dns_client.toip
Expand Down
6 changes: 3 additions & 3 deletions spec/01-unit/12-resolver_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ describe("Resolver", function()
end)

-- non existant request_path
local api, upstream_url, upstream_host, upstream_table = resolver.execute("/inexistant-mockbin", {})
local api, upstream_url, upstream_host, _ = resolver.execute("/inexistant-mockbin", {})
assert.falsy(api)
assert.falsy(upstream_url)
assert.falsy(upstream_host)
Expand Down Expand Up @@ -303,7 +303,7 @@ describe("Resolver", function()
ngx.status = nil
end)
it("should have or not have a trailing slash depending on the request URI", function()
local api, upstream_url, upstream_host, upstream_table = resolver.execute("/strip/", {})
local api, upstream_url, _, upstream_table = resolver.execute("/strip/", {})
assert.same(APIS_FIXTURES[9], api)
assert.same({
authority = 'mockbin.com',
Expand All @@ -328,7 +328,7 @@ describe("Resolver", function()
end)
it("should strip the querystring out of the URI", function()
-- it will be re-inserted by core.handler just before proxying, once all plugins have been run and eventually modified it
local api, upstream_url, upstream_host, upstream_table = resolver.execute("/?hello=world&foo=bar", {["Host"] = "mockbin.com"})
local api, upstream_url, _, upstream_table = resolver.execute("/?hello=world&foo=bar", {["Host"] = "mockbin.com"})
assert.same(APIS_FIXTURES[1], api)
assert.same({
authority = 'mockbin.com',
Expand Down
2 changes: 1 addition & 1 deletion spec/02-integration/04-core/03-dns_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ local function bad_tcp_server(port, duration, ...)
assert(server:setoption('reuseaddr', true))
assert(server:bind("*", port))
assert(server:listen())
local clientlist = {}
while socket.gettime() < expire do
local client, err = server:accept()
socket.sleep(0.1)
Expand All @@ -39,6 +38,7 @@ describe("Core DNS", function()
describe("retries", function()

local retries = 3
local client

setup(function()
assert(helpers.start_kong())
Expand Down

0 comments on commit 42277d1

Please sign in to comment.