Skip to content

Commit 0a2cf68

Browse files
authored
ci: make CI pass under OpenResty 1.19 (#94)
1 parent f80a96d commit 0a2cf68

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ install:
4545
- sudo apt-get update
4646
- sudo apt-get install openresty
4747
- sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
48+
- sudo luarocks install dkjson > build.log 2>&1 || (cat build.log && exit 1)
4849
- make utils
4950
- wget https://github.com/etcd-io/etcd/releases/download/v$ETCD_VER/etcd-v$ETCD_VER-linux-amd64.tar.gz
5051
- tar xf etcd-v$ETCD_VER-linux-amd64.tar.gz

t/v2/dir.t

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ checked val as expect: b
294294
res, err = etcd:mkdir("/dir")
295295
check_res(res, err, nil, nil, true)
296296

297-
local json_val = require("cjson").encode({a = 1, b = 2})
297+
local json_val = require("dkjson").encode({a = 1, b = 2}, {keyorder = {'a', 'b'}})
298298
res, err = etcd:set("/dir/a", json_val)
299299
check_res(res, err)
300300

@@ -344,12 +344,14 @@ item value: "{\"a\":1,\"b\":2}"
344344
check_res(res, err)
345345

346346
ngx.say("item count: ", #res.body.node.nodes)
347-
ngx.say("item value: ", require("cjson").encode(res.body.node.nodes[1].value))
347+
ngx.say("item value: ",
348+
require("dkjson").encode(res.body.node.nodes[1].value, {keyorder = {'a', 'b'}}))
348349

349350
res, err = etcd:get("/dir")
350351
check_res(res, err)
351352
ngx.say("item count: ", #res.body.node.nodes)
352-
ngx.say("item value: ", require("cjson").encode(res.body.node.nodes[1].value))
353+
ngx.say("item value: ",
354+
require("dkjson").encode(res.body.node.nodes[1].value, {keyorder = {'a', 'b'}}))
353355
}
354356
}
355357
--- request

0 commit comments

Comments
 (0)