Skip to content

Commit

Permalink
Merge pull request Kong#916 from Mashape/chore/ci-openssl-fix
Browse files Browse the repository at this point in the history
chore(ci) fix OpenSSL install (outdated version)
  • Loading branch information
thibaultcha committed Jan 30, 2016
2 parents 54f9978 + 11f17b2 commit f97fc27
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
- LUA_VERSION=luajit-2.1
- CASSANDRA_VERSION=2.2.4
- LUAROCKS_VERSION=2.2.2
- OPENSSL_VERSION=1.0.2e
- OPENSSL_VERSION=1.0.2f
- OPENRESTY_VERSION=1.9.3.1
- SERF_VERSION=0.7.0
- DNSMASQ_VERSION=2.75
Expand Down Expand Up @@ -56,4 +56,4 @@ cache:
- $OPENRESTY_DIR
- $SERF_DIR
- $DNSMASQ_DIR
- $HOME/.ccm/repository
- $HOME/.ccm/repository
14 changes: 7 additions & 7 deletions spec/integration/cluster/cluster_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ local function replace_conf_property(t, output_file)
yaml_value = replace_property(yaml_value, k, v)
end
local new_config_content = yaml.dump(yaml_value)

-- Workaround for https://github.com/lubyk/yaml/issues/2
-- This workaround is in two places. To remove it "Find and replace" in the code
new_config_content = string.gsub(new_config_content, "(%w+:%s*)([%w%.]+:%d+)", "%1\"%2\"")
Expand Down Expand Up @@ -80,7 +80,7 @@ describe("Cluster", function()
end)

after_each(function()
pcall(spec_helper.stop_kong, TEST_CONF)
pcall(spec_helper.stop_kong, TEST_CONF)
pcall(spec_helper.stop_kong, SERVER_CONF)
end)

Expand All @@ -106,8 +106,8 @@ describe("Cluster", function()
assert.equal(200, status)
assert.equal(1, cjson.decode(res).total)
end)
it("should register the node on startup with the advertised address", function()

it("#ci should register the node on startup with the advertised address", function()
SECOND_SERVER_PROPERTIES.cluster = {advertise = "5.5.5.5:1234"}
replace_conf_property(SECOND_SERVER_PROPERTIES)

Expand Down Expand Up @@ -184,7 +184,7 @@ describe("Cluster", function()
assert.equal(200, status)
assert.equal(2, cjson.decode(res).total)
end)

it("should register the second node on startup and auto-join asyncronously", function()
local _, exit_code = spec_helper.start_kong(TEST_CONF, true)
assert.are.same(0, exit_code)
Expand Down Expand Up @@ -268,7 +268,7 @@ describe("Cluster", function()
assert.equal(1, cjson.decode(res).total)
end)

it("cache should be purged on the node that joins", function()
it("#ci cache should be purged on the node that joins", function()
replace_conf_property({cluster = {["auto-join"] = false}}, TEST_CONF)
SECOND_SERVER_PROPERTIES.cluster = {["auto-join"] = false}
replace_conf_property(SECOND_SERVER_PROPERTIES)
Expand Down Expand Up @@ -344,4 +344,4 @@ describe("Cluster", function()
replace_conf_property({cluster = {["auto-join"] = true}}, TEST_CONF)
end)

end)
end)

0 comments on commit f97fc27

Please sign in to comment.