functests: Replace execute with either command or feed_command

Hope this will make people using feed_command less likely: this hides bugs.
Already found at least two:

1. msgpackparse() will show internal error: hash_add() in case of duplicate
   keys, though it will still work correctly. Currently silenced.
2. ttimeoutlen was spelled incorrectly, resulting in option not being set when
   expected. Test was still functioning somehow though. Currently fixed.

1 files changed, 8 insertions, 7 deletions

diff --git a/test/functional/legacy/autoformat_join_spec.lua b/test/functional/legacy/autoformat_join_spec.lua
index 4110d66f5b..84d661c190 100644
--- a/test/functional/legacy/autoformat_join_spec.lua
+++ b/test/functional/legacy/autoformat_join_spec.lua
@@ -1,9 +1,9 @@
--- vim: set foldmethod=marker foldmarker=[[,]] :
 -- Tests for setting the '[,'] marks when joining lines.
 
 local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
-local execute, expect = helpers.execute, helpers.expect
+local command, expect = helpers.command, helpers.expect
+local wait = helpers.wait
 
 describe('autoformat join', function()
   setup(clear)
@@ -21,12 +21,13 @@ Results:]])
 
     feed('gg')
     feed('0gqj<cr>')
+    wait()
 
-    execute([[let a=string(getpos("'[")).'/'.string(getpos("']"))]])
-    execute("g/^This line/;'}-join")
-    execute([[let b=string(getpos("'[")).'/'.string(getpos("']"))]])
-    execute("$put ='First test: Start/End '.string(a)")
-    execute("$put ='Second test: Start/End '.string(b)")
+    command([[let a=string(getpos("'[")).'/'.string(getpos("']"))]])
+    command("g/^This line/;'}-join")
+    command([[let b=string(getpos("'[")).'/'.string(getpos("']"))]])
+    command("$put ='First test: Start/End '.string(a)")
+    command("$put ='Second test: Start/End '.string(b)")
 
     expect([[
 		O sodales, ludite, vos qui attamen consulite per voster honur.