Mon, 10 Sep 2018 10:15:33 +0100
main.lua: Some fixes for [luacheck]
main.lua | file | annotate | diff | comparison | revisions |
--- a/main.lua Mon Sep 10 10:02:42 2018 +0100 +++ b/main.lua Mon Sep 10 10:15:33 2018 +0100 @@ -26,7 +26,7 @@ end end -function process_options() +local function process_options() local function get_value() return (assert(table.remove(arg, 1), "unexpected end of command-line options")); end @@ -84,19 +84,19 @@ assert(#arg > 0, "No test script provided"); end -function read_script(script_name) +local function read_script(script_name) io.input(script_name); return io.read("*a"); end -function parse_script(data) +local function parse_script(data) local parser = require "scansion.parser"; return assert(parser.parse(data)); end -function initialize_script(script) +local function initialize_script(script) local c = 0; - for name, object in pairs(script.objects) do + for name, object in pairs(script.objects) do --luacheck: ignore name local o = require("scansion.objects."..object.type); object.handler = o; object.script = script; @@ -107,14 +107,14 @@ o._validate(object); c = c + 1; end - - --print("Script defines "..c.." objects, and "..#script.actions.." actions"); + + --print("Script defines "..c.." objects, and "..#script.actions.." actions"); return script; end -function initialize_verse(errcb) +local function initialize_verse(errcb) local verse = require "verse"; - + verse.set_log_handler(verse._default_log_handler, verse_log_levels); local function error_handler(err) @@ -126,7 +126,7 @@ return verse; end -function main(log_data, script_name) +local function main(log_data, script_name) local ok, err = true; @@ -145,7 +145,7 @@ local verse = initialize_verse(function (_err) ok, err = false, _err end); local async = require "scansion.async"; - local runner = async.runner(function (d) + local runner = async.runner(function () for i, action in ipairs(script.actions) do local object = script.objects[action.object_name]; local handler = object.handler; @@ -177,29 +177,32 @@ end end); end - local ok, err = pcall(handler[action.action], object, action.extra); - if server_log_reader then - log_data("server", { lines = server_log_reader() }); - end - if not ok then - log_data("error", { message = err }); - error(err); + do + --luacheck: ignore ok err + local ok, err = pcall(handler[action.action], object, action.extra); + if server_log_reader then + log_data("server", { lines = server_log_reader() }); + end + if not ok then + log_data("error", { message = err }); + error(err); + end end end script.finished = true; verse.log("info", "Completed script!"); verse.quit(); end, { - error = function (runner, _err) + error = function (runner, _err) --luacheck: ignore runner verse.log("error", "Runner caught error: %s", _err); ok, err = false, _err; verse.quit(); end; }); - + runner:run(true); verse.log("debug", "runner paused") - + verse.loop(); if server_log_reader then @@ -226,11 +229,11 @@ end end -function run_test_script(script_name) +local function run_test_script(script_name) log_data("start", { metadata = test_metadata }); local ok, result, err = pcall(main, log_data, script_name); - + local exit_code = 0; if not ok then print("TEST ERROR:", result);