main.lua

changeset 82
f90056b8e278
parent 81
0ee626030acb
child 89
f353cd50c075
--- a/main.lua	Thu Feb 18 19:02:28 2016 +0000
+++ b/main.lua	Fri Feb 19 11:47:33 2016 +0000
@@ -9,7 +9,7 @@
 local test_metadata = {};
 local server_log_wait_time = 0.2;
 local skip_server_startup_log = false;
-local action_timeout = 1;
+local action_timeout = 5;
 
 local property_rules = {};
 
@@ -59,6 +59,8 @@
 			end
 		elseif opt == "--skip-server-startup-log" then
 			skip_server_startup_log = true;
+		elseif opt == "--step-timeout" then
+			action_timeout = assert(tonumber(get_value()), "number expected for --step-timeout");
 		elseif opt == "--tag" then
 			local tag = get_value();
 			local key, value = tag:match("^([^=]+):(.+)$");
@@ -96,6 +98,9 @@
 		object.handler = o;
 		object.script = script;
 		apply_object_properties(object.type, object.name, object);
+		if object.type == "client" and not object.stanza_timeout then
+			object.stanza_timeout = action_timeout - 1;
+		end
 		o._validate(object);
 		c = c + 1;
 	end

mercurial