aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-09-17 15:28:53 +0100
committerMatthew Wild <mwild1@gmail.com>2018-09-17 15:28:53 +0100
commit0207b2d7858bf626f1720a93bd5eaadfb7dee7cc (patch)
treec297b603cab3e772f099bc403ea1201c5b3e02fd
parent5c12f56a9eeae1f70008ea914b2b2ea5278dd140 (diff)
downloadprosody-0207b2d7858bf626f1720a93bd5eaadfb7dee7cc.tar.gz
prosody-0207b2d7858bf626f1720a93bd5eaadfb7dee7cc.zip
util.json tests: Add [luacheck] annotation to mark intentionally-empty if branch
-rw-r--r--.luacheckrc1
-rw-r--r--spec/util_json_spec.lua2
2 files changed, 1 insertions, 2 deletions
diff --git a/.luacheckrc b/.luacheckrc
index 26427906..e570529a 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -151,7 +151,6 @@ if os.getenv("PROSODY_STRICT_LINT") ~= "1" then
"spec/util_events_spec.lua";
"spec/util_http_spec.lua";
"spec/util_ip_spec.lua";
- "spec/util_json_spec.lua";
"spec/util_multitable_spec.lua";
"spec/util_rfc6724_spec.lua";
"spec/util_throttle_spec.lua";
diff --git a/spec/util_json_spec.lua b/spec/util_json_spec.lua
index dc66c7ba..43360540 100644
--- a/spec/util_json_spec.lua
+++ b/spec/util_json_spec.lua
@@ -42,7 +42,7 @@ describe("util.json", function()
local f = assert(io.open(path.."/"..name));
local content = assert(f:read("*a"));
assert(f:close());
- if skip:find(name) then
+ if skip:find(name) then --luacheck: ignore 542
-- Skip
elseif name:match("^pass") then
valid_data[name] = content;