From df99e43ba46ba6475b2fede9110616d761079fb7 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 14 Sep 2016 10:19:07 -0400 Subject: [PATCH 1/2] tests/ui: Stop the terminal job after testing When running the tests in a contained environment, the lingering terminal processes prevent the unmounting of the filesystems in the contained environment. --- test/functional/ui/output_spec.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 6d24a3c9ff..5576870b29 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -21,6 +21,7 @@ describe("shell command :!", function() end) after_each(function() + child_session.feed_data("\3") -- Ctrl-C screen:detach() end) From c28fb221ba9f4403c3d264cc50c08160141aaacb Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 14 Sep 2016 20:59:09 -0400 Subject: [PATCH 2/2] Restore output_spec assertion dropped in f332eba --- test/functional/ui/output_spec.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 5576870b29..c58bbe9147 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -30,12 +30,12 @@ describe("shell command :!", function() -- to avoid triggering a UI flush. child_session.feed_data(":!printf foo; sleep 200\n") screen:expect([[ - {1: } | - {4:~ }| {4:~ }| {4:~ }| {5:[No Name] }| + :!printf foo; sleep 200 | | + foo | {3:-- TERMINAL --} | ]]) end)