Skip to content

Commit e23edd1

Browse files
committed
ci: fix test case
1 parent f267bb2 commit e23edd1

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

t/v3/serializer.t

+16-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
use Test::Nginx::Socket::Lua 'no_plan';
1+
use Test::Nginx::Socket::Lua;
22

3-
log_level('warn');
3+
log_level('info');
44
no_long_string();
5-
repeat_each(2);
5+
repeat_each(1);
6+
7+
my $etcd_version = `etcd --version`;
8+
if ($etcd_version =~ /^etcd Version: 2/ || $etcd_version =~ /^etcd Version: 3.1./) {
9+
plan(skip_all => "etcd is too old, skip v3 protocol");
10+
} else {
11+
plan 'no_plan';
12+
}
613

714
our $HttpConfig = <<'_EOC_';
815
lua_socket_log_errors off;
@@ -13,6 +20,7 @@ our $HttpConfig = <<'_EOC_';
1320
function check_res(data, err, val, status)
1421
if err then
1522
ngx.say("err: ", err)
23+
ngx.exit(200)
1624
end
1725
1826
if val then
@@ -23,6 +31,7 @@ our $HttpConfig = <<'_EOC_';
2331
ngx.say("failed to check value")
2432
ngx.log(ngx.ERR, "failed to check value, got: ", data.body.kvs[1].value,
2533
", expect: ", val)
34+
ngx.exit(200)
2635
else
2736
ngx.say("checked val as expect: ", val)
2837
end
@@ -53,9 +62,6 @@ __DATA__
5362
check_res(etcd, err)
5463
5564
local res
56-
res, err = etcd:set("/dir/v3/a", 111)
57-
check_res(res, err)
58-
5965
res, err = etcd:set("/dir/v3/b", '"foo"')
6066
check_res(res, err)
6167
@@ -74,17 +80,20 @@ __DATA__
7480
7581
res, err = etcd:get("/dir/v3/d")
7682
check_res(res, err, "", 200)
83+
84+
res, err = etcd:set("/dir/v3/a", 111)
85+
check_res(res, err)
7786
}
7887
}
7988
--- request
8089
GET /t
8190
--- no_error_log
8291
[error]
8392
--- response_body
84-
err: unsupported type for number
8593
checked val as expect: "foo"
8694
checked val as expect: {"a":1}
8795
checked val as expect:
96+
err: unsupported type for number
8897
8998
9099
=== TEST 2: json serializer

0 commit comments

Comments
 (0)