From 67ad9fdb1b23e9442dad1369c5ea23ff5beecedc Mon Sep 17 00:00:00 2001 From: thefosk Date: Fri, 24 Apr 2015 15:43:42 -0700 Subject: [PATCH 1/4] verbose --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ca2ed50d74..fbe087f774d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ install: - sudo make install - sudo make dev -script: "busted --coverage spec/" +script: "busted -v --coverage spec/" after_success: "luacov-coveralls -i kong" From fb59913e682b11efc36405b61f5eb995f016d8ce Mon Sep 17 00:00:00 2001 From: thefosk Date: Fri, 24 Apr 2015 15:50:08 -0700 Subject: [PATCH 2/4] trying to remove syslog_spec --- spec/unit/syslog_spec.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/unit/syslog_spec.lua b/spec/unit/syslog_spec.lua index abdf3a19d14..68208672f30 100644 --- a/spec/unit/syslog_spec.lua +++ b/spec/unit/syslog_spec.lua @@ -3,7 +3,7 @@ local Threads = require "llthreads2.ex" local constants = require "kong.constants" local utils = require "kong.tools.utils" local stringy = require "stringy" - +--[[ local function start_udp_server() local thread = Threads.new({ function() @@ -68,4 +68,5 @@ describe("Syslog", function() assert.truthy(has_hello) end) -end) \ No newline at end of file +end) +--]] \ No newline at end of file From 4c825050862d328d5d0bb3acb2baee8253da67ef Mon Sep 17 00:00:00 2001 From: thefosk Date: Fri, 24 Apr 2015 16:04:39 -0700 Subject: [PATCH 3/4] re-enabling syslog_spec --- spec/unit/syslog_spec.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/unit/syslog_spec.lua b/spec/unit/syslog_spec.lua index 68208672f30..5d199a349ef 100644 --- a/spec/unit/syslog_spec.lua +++ b/spec/unit/syslog_spec.lua @@ -3,13 +3,13 @@ local Threads = require "llthreads2.ex" local constants = require "kong.constants" local utils = require "kong.tools.utils" local stringy = require "stringy" ---[[ + local function start_udp_server() local thread = Threads.new({ function() local socket = require("socket") udp = socket.udp() - udp:setsockname("*", 8888) + udp:setsockname("*", 8889) data, ip, port = udp:receivefrom() return data end; @@ -26,7 +26,7 @@ describe("Syslog", function() -- Override constants constants.SYSLOG.ADDRESS = "127.0.0.1" - constants.SYSLOG.PORT = 8888 + constants.SYSLOG.PORT = 8889 -- Make the request syslog.log({hello="world"}) @@ -68,5 +68,4 @@ describe("Syslog", function() assert.truthy(has_hello) end) -end) ---]] \ No newline at end of file +end) \ No newline at end of file From ffbae51d144d9a190a5b8a0a7767c3f9ba5e3e93 Mon Sep 17 00:00:00 2001 From: thefosk Date: Fri, 24 Apr 2015 16:18:26 -0700 Subject: [PATCH 4/4] forcing /bin/bash --- .travis.yml | 2 +- kong/tools/io.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbe087f774d..6ca2ed50d74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ install: - sudo make install - sudo make dev -script: "busted -v --coverage spec/" +script: "busted --coverage spec/" after_success: "luacov-coveralls -i kong" diff --git a/kong/tools/io.lua b/kong/tools/io.lua index 68b488f8af8..adc8e2eb4e9 100644 --- a/kong/tools/io.lua +++ b/kong/tools/io.lua @@ -8,7 +8,7 @@ _M.path = path function _M.os_execute(command) local n = os.tmpname() -- get a temporary file name to store output - local exit_code = os.execute(command.." > "..n.." 2>&1") + local exit_code = os.execute("/bin/bash -c '"..command.." > "..n.." 2>&1'") local result = _M.read_file(n) os.remove(n)