Mercurial > scansion / file diff

--- a/main.lua	Wed Sep 12 10:57:23 2018 +0100
+++ b/main.lua	Wed Sep 12 10:58:46 2018 +0100
@@ -282,21 +282,25 @@
 
 local function run_test_script(script_name, script_text)
 	local script = parse_script(script_text)
-	log_data("script", { title = script.title, summary = script.summary, tags = script.tags, filename = script_name });
+	local script_data = { title = script.title, summary = script.summary, tags = script.tags, filename = script_name };
+	log_data("script", script_data);
 
 	local ok, result, err = pcall(main, log_data, script);
 
-	local status, reason = "ok";
+	local event, status, reason;
 	if not ok then
-		status, reason = "error", result;
-		log_data("test-error", { error = result });
+		event, status, reason = "test-error", "error", result;
 	elseif not result then
-		status, reason = "fail", err;
-		log_data("test-failed", { error = err });
+		event, status, reason = "test-failed", "fail", err;
 	else
-		log_data("test-passed");
+		event, status, reason = "test-passed", "ok", nil;
 	end
-	return { name = script.title or script_name, status = status, reason = reason };
+
+	local result_data = { name = script.title or script_name, status = status, reason = reason };
+
+	log_data(event, result_data);
+
+	return result_data;
 end