Mon, 10 Sep 2018 14:56:55 +0100
squishy: Add new modules 'console' and 'pretty'
54 | 1 | #!/usr/bin/env luajit |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
2 | |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
3 | local json = require "cjson"; |
61
21871fb2db99
main: Switch to socket.gettime for higher accuracy timestamps in machine-readable logs
Matthew Wild <mwild1@gmail.com>
parents:
59
diff
changeset
|
4 | local time = require "socket".gettime; |
67
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
5 | local sleep = require "socket".sleep; |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
6 | |
110
d58403c8615e
main.lua: Don't log traceback for normal scansion internal errors
Matthew Wild <mwild1@gmail.com>
parents:
109
diff
changeset
|
7 | local is_scansion_error = require "scansion.error".is; |
115
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
8 | local console_handlers = require "scansion.console".handlers; |
110
d58403c8615e
main.lua: Don't log traceback for normal scansion internal errors
Matthew Wild <mwild1@gmail.com>
parents:
109
diff
changeset
|
9 | |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
10 | local result_log_filename = nil; |
62
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
11 | local server_log_reader = nil; |
69
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
12 | local test_metadata = {}; |
67
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
13 | local server_log_wait_time = 0.2; |
76
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
14 | local skip_server_startup_log = false; |
82
f90056b8e278
main.lua, client: Make timeouts more coherent (stanza timeout was greater than action timeout), add command-line options to change them
Matthew Wild <mwild1@gmail.com>
parents:
81
diff
changeset
|
15 | local action_timeout = 5; |
107
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
16 | local verse_log_levels = { "warn", "error" }; |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
17 | local quiet = false; |
67
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
18 | |
56
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
19 | local property_rules = {}; |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
20 | |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
21 | local function apply_object_properties(class, name, object) |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
22 | for _, rule in ipairs(property_rules) do |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
23 | if (not(rule.class) or tostring(rule.class):lower() == tostring(class):lower()) |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
24 | and (not(rule.name) or tostring(rule.name):lower() == tostring(name):lower()) then |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
25 | for prop_key, prop_value in pairs(rule.properties) do |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
26 | object[prop_key] = prop_value; |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
27 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
28 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
29 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
30 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
31 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
32 | local function process_options() |
56
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
33 | local function get_value() |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
34 | return (assert(table.remove(arg, 1), "unexpected end of command-line options")); |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
35 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
36 | while arg[1] and arg[1]:sub(1,1) == "-" do |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
37 | local opt = arg[1]; |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
38 | if opt == "--" then |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
39 | table.remove(arg, 1); |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
40 | break; |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
41 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
42 | table.remove(arg, 1); |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
43 | if opt == "--port" or opt == "-p" then |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
44 | local port = assert(tonumber(get_value()), "port number must be a number"); |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
45 | table.insert(property_rules, { class = "client", properties = { connect_port = port } }); |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
46 | elseif opt == "--host" or opt == "-h" then |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
47 | local host = get_value(); |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
48 | table.insert(property_rules, { class = "client", properties = { connect_host = host } }); |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
49 | elseif opt == "--out" or opt == "-o" then |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
50 | result_log_filename = get_value(); |
62
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
51 | elseif opt == "--server-log" or opt == "-s" then |
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
52 | local server_log = assert(io.open(get_value(), "r")); |
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
53 | function server_log_reader() |
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
54 | local new_lines = {}; |
67
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
55 | local last_line_time = time(); |
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
56 | while time() - last_line_time < server_log_wait_time do |
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
57 | sleep(0.05); |
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
58 | for line in server_log:lines() do |
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
59 | table.insert(new_lines, line); |
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
60 | last_line_time = time(); |
a2a9dd606200
main: Add delay when reading server logs
Matthew Wild <mwild1@gmail.com>
parents:
65
diff
changeset
|
61 | end |
62
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
62 | end |
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
63 | return new_lines; |
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
64 | end |
76
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
65 | elseif opt == "--skip-server-startup-log" then |
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
66 | skip_server_startup_log = true; |
82
f90056b8e278
main.lua, client: Make timeouts more coherent (stanza timeout was greater than action timeout), add command-line options to change them
Matthew Wild <mwild1@gmail.com>
parents:
81
diff
changeset
|
67 | elseif opt == "--step-timeout" then |
f90056b8e278
main.lua, client: Make timeouts more coherent (stanza timeout was greater than action timeout), add command-line options to change them
Matthew Wild <mwild1@gmail.com>
parents:
81
diff
changeset
|
68 | action_timeout = assert(tonumber(get_value()), "number expected for --step-timeout"); |
69
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
69 | elseif opt == "--tag" then |
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
70 | local tag = get_value(); |
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
71 | local key, value = tag:match("^([^=]+):(.+)$"); |
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
72 | if key and value then |
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
73 | test_metadata[key] = value; |
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
74 | else |
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
75 | error("Unable to parse tag: "..tag); |
1de0ebd8832f
main.lua: Support tagging metadata for test runs, and include it in JSON output
Matthew Wild <mwild1@gmail.com>
parents:
68
diff
changeset
|
76 | end |
107
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
77 | elseif opt == "--verbose" or opt == "-v" then |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
78 | verse_log_levels = { "debug", "info", "warn", "error" }; |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
79 | quiet = false; |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
80 | elseif opt == "--quiet" or opt == "-q" then |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
81 | verse_log_levels = { "error" }; |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
82 | quiet = true; |
58
8fa0a464c727
main.lua: Error on unknown command-line options
Matthew Wild <mwild1@gmail.com>
parents:
57
diff
changeset
|
83 | else |
8fa0a464c727
main.lua: Error on unknown command-line options
Matthew Wild <mwild1@gmail.com>
parents:
57
diff
changeset
|
84 | error("Unhandled command-line option: "..opt); |
56
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
85 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
86 | end |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
87 | assert(#arg > 0, "No test script provided"); |
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
88 | end |
0
2e31b584f8d9
It is better to write and run incomplete tests than not to run complete tests. -- Martin Fowler
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
89 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
90 | local function read_script(script_name) |
108
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
91 | io.input(script_name); |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
92 | return io.read("*a"); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
93 | end |
0
2e31b584f8d9
It is better to write and run incomplete tests than not to run complete tests. -- Martin Fowler
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
94 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
95 | local function parse_script(data) |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
96 | local parser = require "scansion.parser"; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
97 | return assert(parser.parse(data)); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
98 | end |
0
2e31b584f8d9
It is better to write and run incomplete tests than not to run complete tests. -- Martin Fowler
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
99 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
100 | local function initialize_script(script) |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
101 | local c = 0; |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
102 | for name, object in pairs(script.objects) do --luacheck: ignore name |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
103 | local o = require("scansion.objects."..object.type); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
104 | object.handler = o; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
105 | object.script = script; |
56
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
106 | apply_object_properties(object.type, object.name, object); |
82
f90056b8e278
main.lua, client: Make timeouts more coherent (stanza timeout was greater than action timeout), add command-line options to change them
Matthew Wild <mwild1@gmail.com>
parents:
81
diff
changeset
|
107 | if object.type == "client" and not object.stanza_timeout then |
f90056b8e278
main.lua, client: Make timeouts more coherent (stanza timeout was greater than action timeout), add command-line options to change them
Matthew Wild <mwild1@gmail.com>
parents:
81
diff
changeset
|
108 | object.stanza_timeout = action_timeout - 1; |
f90056b8e278
main.lua, client: Make timeouts more coherent (stanza timeout was greater than action timeout), add command-line options to change them
Matthew Wild <mwild1@gmail.com>
parents:
81
diff
changeset
|
109 | end |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
110 | o._validate(object); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
111 | c = c + 1; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
112 | end |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
113 | |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
114 | --print("Script defines "..c.." objects, and "..#script.actions.." actions"); |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
115 | return script; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
116 | end |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
117 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
118 | local function initialize_verse(errcb) |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
119 | local verse = require "verse"; |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
120 | |
107
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
121 | verse.set_log_handler(verse._default_log_handler, verse_log_levels); |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
122 | |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
123 | local function error_handler(err) |
110
d58403c8615e
main.lua: Don't log traceback for normal scansion internal errors
Matthew Wild <mwild1@gmail.com>
parents:
109
diff
changeset
|
124 | -- Only log actual errors. Those reported by Scansion will be handled gracefully higher up. |
d58403c8615e
main.lua: Don't log traceback for normal scansion internal errors
Matthew Wild <mwild1@gmail.com>
parents:
109
diff
changeset
|
125 | if not is_scansion_error(err) then |
d58403c8615e
main.lua: Don't log traceback for normal scansion internal errors
Matthew Wild <mwild1@gmail.com>
parents:
109
diff
changeset
|
126 | verse.log("error", "Error: %s", err); |
d58403c8615e
main.lua: Don't log traceback for normal scansion internal errors
Matthew Wild <mwild1@gmail.com>
parents:
109
diff
changeset
|
127 | verse.log("error", "Traceback: %s", debug.traceback()); |
d58403c8615e
main.lua: Don't log traceback for normal scansion internal errors
Matthew Wild <mwild1@gmail.com>
parents:
109
diff
changeset
|
128 | end |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
129 | errcb(err); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
130 | end |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
131 | verse.set_error_handler(error_handler); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
132 | return verse; |
0
2e31b584f8d9
It is better to write and run incomplete tests than not to run complete tests. -- Martin Fowler
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
133 | end |
2e31b584f8d9
It is better to write and run incomplete tests than not to run complete tests. -- Martin Fowler
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
134 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
135 | local function main(log_data, script_name) |
56
5eda634ea15b
main.lua: Command-line processing, and a way to set connect_host/connect_port from the command-line
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
136 | |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
137 | local ok, err = true; |
0
2e31b584f8d9
It is better to write and run incomplete tests than not to run complete tests. -- Martin Fowler
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
138 | |
108
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
139 | local script = initialize_script(parse_script(read_script(script_name))); |
71
f7dbb46b5770
main.lua: Log script title and summary
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
140 | |
113
f5c1ccc58b48
main: Include script filename in "script" log event
Matthew Wild <mwild1@gmail.com>
parents:
110
diff
changeset
|
141 | log_data("script", { title = script.title, summary = script.summary, tags = script.tags, filename = script_name }); |
71
f7dbb46b5770
main.lua: Log script title and summary
Matthew Wild <mwild1@gmail.com>
parents:
69
diff
changeset
|
142 | |
62
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
143 | if server_log_reader then |
76
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
144 | if skip_server_startup_log then |
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
145 | server_log_reader(); |
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
146 | else |
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
147 | log_data("server", { lines = server_log_reader() }); |
fecc1af937be
main.lua: Add --skip-server-startup-log to discard server log output at startup
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
148 | end |
62
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
149 | end |
52a24deb0cc3
main: Support for --server-log/-s option, which reads the server's log file during a test and includes it in the JSON log
Matthew Wild <mwild1@gmail.com>
parents:
61
diff
changeset
|
150 | |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
151 | local verse = initialize_verse(function (_err) ok, err = false, _err end); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
152 | local async = require "scansion.async"; |
7
ecac723bb6e1
main: Run actions in async runner
Matthew Wild <mwild1@gmail.com>
parents:
3
diff
changeset
|
153 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
154 | local runner = async.runner(function () |
80
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
155 | for i, action in ipairs(script.actions) do |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
156 | local object = script.objects[action.object_name]; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
157 | local handler = object.handler; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
158 | assert(handler[action.action], "Objects of type '"..object.type.."' do not support action '"..action.action.."'"); |
107
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
159 | if not quiet then |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
160 | print(""); |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
161 | end |
68
cd63f764d1bf
main.lua: Restructure server log reading
Matthew Wild <mwild1@gmail.com>
parents:
67
diff
changeset
|
162 | if server_log_reader then |
cd63f764d1bf
main.lua: Restructure server log reading
Matthew Wild <mwild1@gmail.com>
parents:
67
diff
changeset
|
163 | log_data("server", { lines = server_log_reader() }); |
cd63f764d1bf
main.lua: Restructure server log reading
Matthew Wild <mwild1@gmail.com>
parents:
67
diff
changeset
|
164 | end |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
165 | log_data("action", { |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
166 | action = action.action; |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
167 | object = object.name; |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
168 | object_type = object.type; |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
169 | extra = action.extra; |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
170 | annotation = action.annotation; |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
171 | }); |
115
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
172 | --[[ |
107
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
173 | if not quiet then |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
174 | if action.annotation then |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
175 | print(action.annotation); |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
176 | end |
65791ba388b9
scansion: Add -q and -v for controlling log output
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
177 | print(object.name.." "..action.action); |
115
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
178 | end]] |
80
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
179 | if action_timeout and action_timeout > 0 then |
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
180 | local action_number = i; |
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
181 | verse.add_task(action_timeout, function () |
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
182 | if i == action_number then |
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
183 | error("Timeout waiting for response from server"); |
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
184 | end |
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
185 | end); |
6676218cc481
main.lua: Add per-action timeout
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
186 | end |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
187 | do |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
188 | --luacheck: ignore ok err |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
189 | local ok, err = pcall(handler[action.action], object, action.extra); |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
190 | if server_log_reader then |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
191 | log_data("server", { lines = server_log_reader() }); |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
192 | end |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
193 | if not ok then |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
194 | log_data("error", { message = err }); |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
195 | error(err); |
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
196 | end |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
197 | end |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
198 | end |
89
f353cd50c075
main.lua: Add flag for when script has finished
Matthew Wild <mwild1@gmail.com>
parents:
82
diff
changeset
|
199 | script.finished = true; |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
200 | verse.log("info", "Completed script!"); |
30
3c2489e79074
main: Remove 5s delay on quitting (was a hack for debug purposes)
Matthew Wild <mwild1@gmail.com>
parents:
21
diff
changeset
|
201 | verse.quit(); |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
202 | end, { |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
203 | error = function (runner, _err) --luacheck: ignore runner |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
204 | verse.log("error", "Runner caught error: %s", _err); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
205 | ok, err = false, _err; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
206 | verse.quit(); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
207 | end; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
208 | }); |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
209 | |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
210 | runner:run(true); |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
211 | verse.log("debug", "runner paused") |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
212 | |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
213 | verse.loop(); |
81
0ee626030acb
main.lua: Read any remaining server logs after script completes (error or otherwise)
Matthew Wild <mwild1@gmail.com>
parents:
80
diff
changeset
|
214 | |
0ee626030acb
main.lua: Read any remaining server logs after script completes (error or otherwise)
Matthew Wild <mwild1@gmail.com>
parents:
80
diff
changeset
|
215 | if server_log_reader then |
0ee626030acb
main.lua: Read any remaining server logs after script completes (error or otherwise)
Matthew Wild <mwild1@gmail.com>
parents:
80
diff
changeset
|
216 | log_data("server", { lines = server_log_reader() }); |
0ee626030acb
main.lua: Read any remaining server logs after script completes (error or otherwise)
Matthew Wild <mwild1@gmail.com>
parents:
80
diff
changeset
|
217 | end |
0ee626030acb
main.lua: Read any remaining server logs after script completes (error or otherwise)
Matthew Wild <mwild1@gmail.com>
parents:
80
diff
changeset
|
218 | |
117
fd4025e54f4d
main: Add _finish handler so objects can clean up
Matthew Wild <mwild1@gmail.com>
parents:
115
diff
changeset
|
219 | for name, obj in pairs(script.objects) do |
fd4025e54f4d
main: Add _finish handler so objects can clean up
Matthew Wild <mwild1@gmail.com>
parents:
115
diff
changeset
|
220 | if obj.handler._finish then |
fd4025e54f4d
main: Add _finish handler so objects can clean up
Matthew Wild <mwild1@gmail.com>
parents:
115
diff
changeset
|
221 | obj.handler._finish(obj); |
fd4025e54f4d
main: Add _finish handler so objects can clean up
Matthew Wild <mwild1@gmail.com>
parents:
115
diff
changeset
|
222 | end |
fd4025e54f4d
main: Add _finish handler so objects can clean up
Matthew Wild <mwild1@gmail.com>
parents:
115
diff
changeset
|
223 | end |
fd4025e54f4d
main: Add _finish handler so objects can clean up
Matthew Wild <mwild1@gmail.com>
parents:
115
diff
changeset
|
224 | |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
225 | return ok, err; |
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
226 | end |
7
ecac723bb6e1
main: Run actions in async runner
Matthew Wild <mwild1@gmail.com>
parents:
3
diff
changeset
|
227 | |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
228 | -- Process command-line options |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
229 | process_options(); |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
230 | |
115
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
231 | local function console_logger(event, data) |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
232 | if not quiet or type == "test-failed" or type == "test-error" then |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
233 | local h = console_handlers[event]; |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
234 | if h then |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
235 | io.write(h(data), "\n"); |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
236 | end |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
237 | end |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
238 | end |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
239 | |
3 | 240 | |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
241 | local result_log; |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
242 | if result_log_filename then |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
243 | result_log = assert(io.open(result_log_filename, "w+")); |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
244 | result_log:write("[\n"); |
115
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
245 | end |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
246 | |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
247 | local function log_data(type, data) |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
248 | console_logger(type, data); |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
249 | |
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
250 | if result_log then |
61
21871fb2db99
main: Switch to socket.gettime for higher accuracy timestamps in machine-readable logs
Matthew Wild <mwild1@gmail.com>
parents:
59
diff
changeset
|
251 | local entry = { type = type, data = data, time = time() }; |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
252 | result_log:write(" ", json.encode(entry), ",\n"); |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
253 | result_log:flush(); |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
254 | end |
115
0f8d0906af6e
Revamp console output to be driven by log_data()
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
255 | end; |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
256 | |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
257 | local function run_test_script(script_name) |
108
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
258 | local ok, result, err = pcall(main, log_data, script_name); |
109
f7609d1a5bdf
main.lua: Some fixes for [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
108
diff
changeset
|
259 | |
108
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
260 | local exit_code = 0; |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
261 | if not ok then |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
262 | exit_code = 2; |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
263 | log_data("test-error", { error = result }); |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
264 | elseif not result then |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
265 | exit_code = 1; |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
266 | log_data("test-failed", { error = err }); |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
267 | elseif not quiet then |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
268 | log_data("test-passed"); |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
269 | end |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
270 | return exit_code; |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
271 | end |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
272 | |
114
48aab6c9e9d3
main: Move 'start' event to correct place (signals start of test run, not individual tests)
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
273 | log_data("start", { metadata = test_metadata }); |
48aab6c9e9d3
main: Move 'start' event to correct place (signals start of test run, not individual tests)
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
274 | |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
275 | local exit_code = 0; |
108
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
276 | for i = 1, #arg do |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
277 | local ret = run_test_script(arg[i]); |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
278 | if ret > exit_code then |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
279 | exit_code = ret; |
cd58c64c67c0
scansion: Add support for passing multiple scripts on the command-line
Matthew Wild <mwild1@gmail.com>
parents:
107
diff
changeset
|
280 | end |
21
8ac80da35408
main: Refactor into functions
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
281 | end |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
282 | |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
283 | if result_log then |
63
0f19ffbe1519
main: Separate logging for the last event to ensure proper JSON syntax
Matthew Wild <mwild1@gmail.com>
parents:
62
diff
changeset
|
284 | result_log:write([[ {"type": "end", "time": ]]..time().."}\n]\n"); |
57
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
285 | result_log:close(); |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
286 | end |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
287 | |
6407a0157518
main.lua: Add support for JSON log output to a file, for a machine-readable transcript of the test results
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
288 | os.exit(exit_code); |