test: require fewest number of main loop iterations possible

Change exc_exec to pcall_err to reduce one main loop iteration.
No need to call poke_eventloop() unless after nvim_input().

1 files changed, 12 insertions, 16 deletions

diff --git a/test/functional/terminal/channel_spec.lua b/test/functional/terminal/channel_spec.lua
index 7d37dcccc8..7223f5ba61 100644
--- a/test/functional/terminal/channel_spec.lua
+++ b/test/functional/terminal/channel_spec.lua
@@ -2,7 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local command = helpers.command
-local exc_exec = helpers.exc_exec
+local pcall_err = helpers.pcall_err
 local feed = helpers.feed
 local sleep = helpers.sleep
 local poke_eventloop = helpers.poke_eventloop
@@ -13,24 +13,22 @@ describe('associated channel is closed and later freed for terminal', function()
   it('opened by nvim_open_term() and deleted by :bdelete!', function()
     command([[let id = nvim_open_term(0, {})]])
     -- channel hasn't been freed yet
-    eq("Vim(call):Can't send data to closed stream", exc_exec([[bdelete! | call chansend(id, 'test')]]))
-    -- process free_channel_event
-    poke_eventloop()
-    -- channel has been freed
-    eq("Vim(call):E900: Invalid channel id", exc_exec([[call chansend(id, 'test')]]))
+    eq("Vim(call):Can't send data to closed stream", pcall_err(command, [[bdelete! | call chansend(id, 'test')]]))
+    -- channel has been freed after one main loop iteration
+    eq("Vim(call):E900: Invalid channel id", pcall_err(command, [[call chansend(id, 'test')]]))
   end)
 
   it('opened by termopen(), exited, and deleted by pressing a key', function()
     command([[let id = termopen('echo')]])
     sleep(500)
     -- process has exited
-    eq("Vim(call):Can't send data to closed stream", exc_exec([[call chansend(id, 'test')]]))
+    eq("Vim(call):Can't send data to closed stream", pcall_err(command, [[call chansend(id, 'test')]]))
     -- delete terminal
     feed('i<CR>')
-    -- process term_delayed_free and free_channel_event
+    -- need to first process input
     poke_eventloop()
-    -- channel has been freed
-    eq("Vim(call):E900: Invalid channel id", exc_exec([[call chansend(id, 'test')]]))
+    -- channel has been freed after another main loop iteration
+    eq("Vim(call):E900: Invalid channel id", pcall_err(command, [[call chansend(id, 'test')]]))
   end)
 
   -- This indirectly covers #16264
@@ -38,12 +36,10 @@ describe('associated channel is closed and later freed for terminal', function()
     command([[let id = termopen('echo')]])
     sleep(500)
     -- process has exited
-    eq("Vim(call):Can't send data to closed stream", exc_exec([[call chansend(id, 'test')]]))
+    eq("Vim(call):Can't send data to closed stream", pcall_err(command, [[call chansend(id, 'test')]]))
     -- channel hasn't been freed yet
-    eq("Vim(call):Can't send data to closed stream", exc_exec([[bdelete | call chansend(id, 'test')]]))
-    -- process term_delayed_free and free_channel_event
-    poke_eventloop()
-    -- channel has been freed
-    eq("Vim(call):E900: Invalid channel id", exc_exec([[call chansend(id, 'test')]]))
+    eq("Vim(call):Can't send data to closed stream", pcall_err(command, [[bdelete | call chansend(id, 'test')]]))
+    -- channel has been freed after one main loop iteration
+    eq("Vim(call):E900: Invalid channel id", pcall_err(command, [[call chansend(id, 'test')]]))
   end)
 end)