Tests for Lua API extension proposed in martanne/vis#675

lua/subprocess.lua

@@ -0,0 +1,79 @@
+require 'busted.runner'()
+
+local function hardfail()
+	-- It is only way to notify about the failure from the QUIT event handler
+	print('TEST FAILED')
+end
+
+local expected_events = {}
+
+local failed = false
+vis.events.subscribe(vis.events.QUIT, function ()
+	for k, v in pairs(expected_events) do
+		if v and #v > 0 then
+			failed = true
+			print("The following events did not happened for process", k)
+			for i, vv in pairs(v) do
+				print(tostring(i)..": ",
+					vv.etype, " - ("..tostring(vv.expected_code) .. ", " .. tostring(vv.expected_buffer)..")")
+			end
+		end
+	end
+	if failed then hardfail() end
+end)
+
+vis.events.subscribe(vis.events.PROCESS_RESPONSE, function (name, et, ec, eb)
+	if expected_events[name] and #(expected_events[name]) > 0 then
+		local current_event = table.remove(expected_events[name], 1)
+		if ec ~= current_event.expected_code or eb ~= current_event.expected_buffer or et ~= current_event.etype then
+			print("Event assert failed for process:", name)
+			print("Got event type:", "("..type(et)..")", et)
+			print("Expected:", "("..type(current_event.etype)..")", current_event.etype)
+			print("Got event code:", "(", type(ec), ")", ec)
+			print("Expected:", "("..type(current_event.expected_code)..")",
+			      current_event.expected_code)
+			print("Got event buffer:", "(", type(eb), ")", eb)
+			print("Expected:", "("..type(current_event.expected_buffer)..")",
+			      current_event.expected_buffer)
+			if #(expected_events[name]) > 0 then
+				print("Remaining expected events to be fired by process", name)
+				for i, k in pairs(expected_events[name]) do
+					print(tostring(i)..": ",
+					      k.etype, " - ("..tostring(k.expected_code) .. ", " .. tostring(k.expected_buffer)..")")
+				end
+			end
+			hardfail()
+		end
+	end
+end)
+
+local function event_assert(name, eventtype, expected_code, expected_buffer)
+	if not expected_events[name] then expected_events[name] = {} end
+	table.insert(expected_events[name], {
+		etype = eventtype,
+		expected_code = expected_code,
+		expected_buffer = expected_buffer
+	})
+end
+
+describe("vis.communicate", function ()
+	it("process creation", function ()
+		event_assert("starttest", "STDOUT", nil, "testanswer\n")
+		event_assert("starttest", "EXIT", 0, nil)
+		vis:communicate("starttest", "echo testanswer")
+	end)
+	it("process termination", function()
+		event_assert("termtest", "SIGNAL", 15, nil)
+		local handle = vis:communicate("termtest", "sleep 1s")
+		handle:close()
+	end)
+	it("process input/stderr", function()
+		event_assert("inputtest", "STDERR", nil, "testdata\n")
+		event_assert("inputtest", "EXIT", 0, nil)
+		local handle = vis:communicate("inputtest", "read n; echo $n 1>&2")
+		handle:write("testdata\n")
+		handle:flush()
+		-- do not close handle because it is being closed automaticaly
+		-- when process quits
+	end)
+end)

lua/test.sh

@@ -28,15 +28,18 @@ for t in $test_files; do
 	t=${t%.lua}
 	t=${t#./}
 	printf "%-30s" "$t"
-	$VIS "$t.in" < /dev/null 2> /dev/null > "$t.busted"
-
+	mkfifo infifo
+	$VIS "$t.in" <infifo 2> /dev/null > "$t.busted" &
+	for i in 1;	do sleep 0.05; echo ":qall!"; done > infifo &
+	wait %1 && wait %2 && ! grep -o 'TEST FAILED' "$t.busted" &> /dev/null
 	if [ $? -ne 0 ]; then
 		printf "FAIL\n"
 		cat "$t.busted"
 	else
 		TESTS_OK=$((TESTS_OK + 1))
 		printf "OK\n"
 	fi
+	rm infifo
 done
 
 printf "Tests ok %d/%d\n" $TESTS_OK $TESTS_RUN

lua/visrc.lua

@@ -6,7 +6,7 @@ io.stderr = io.stdout
 
 -- make sure we gracefully terminate, cleanup terminal state etc.
 os.exit = function(status)
-	vis:exit(status)
+	if status ~= 0 then vis:exit(status) end
 end
 
 vis.events.subscribe(vis.events.WIN_OPEN, function(win)
@@ -24,5 +24,4 @@ vis.events.subscribe(vis.events.WIN_OPEN, function(win)
 			return
 		end
 	end
-	vis:exit(0)
 end)