From 65fb622000af8e3dbb65480e1581758ecf4ba3e2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 9 Apr 2017 00:12:26 +0300
Subject: 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.
---
 test/functional/legacy/097_glob_path_spec.lua | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'test/functional/legacy/097_glob_path_spec.lua')

diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua
index 23f1427cb5..0d71872def 100644
--- a/test/functional/legacy/097_glob_path_spec.lua
+++ b/test/functional/legacy/097_glob_path_spec.lua
@@ -4,7 +4,7 @@
 
 local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
-local execute, expect = helpers.execute, helpers.expect
+local command, expect = helpers.command, helpers.expect
 
 if helpers.pending_win32(pending) then return end
 
@@ -19,26 +19,26 @@ describe('glob() and globpath()', function()
 
   it('is working', function()
     -- Make sure glob() doesn't use the shell
-    execute('set shell=doesnotexist')
+    command('set shell=doesnotexist')
 
     -- Consistent sorting of file names
-    execute('set nofileignorecase')
+    command('set nofileignorecase')
 
-    execute([[$put =glob('Xxx\{')]])
-    execute([[$put =glob('Xxx\$')]])
+    command([[$put =glob('Xxx\{')]])
+    command([[$put =glob('Xxx\$')]])
 
-    execute('w! Xxx{')
-    execute([[w! Xxx\$]])
-    execute([[$put =glob('Xxx\{')]])
-    execute([[$put =glob('Xxx\$')]])
+    command('w! Xxx{')
+    command([[w! Xxx\$]])
+    command([[$put =glob('Xxx\{')]])
+    command([[$put =glob('Xxx\$')]])
 
-    execute("$put =string(globpath('sautest/autoload', '*.vim'))")
-    execute("$put =string(globpath('sautest/autoload', '*.vim', 0, 1))")
+    command("$put =string(globpath('sautest/autoload', '*.vim'))")
+    command("$put =string(globpath('sautest/autoload', '*.vim', 0, 1))")
 
     expect([=[
-      
-      
-      
+
+
+
       Xxx{
       Xxx$
       'sautest/autoload/Test104.vim
-- 
cgit 


From 5fd8f637afed8edd4dbb927e3ffd87108001811d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 9 Apr 2017 02:04:52 +0300
Subject: functests: Fix legacy/097_glob_path_spec

---
 test/functional/legacy/097_glob_path_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/functional/legacy/097_glob_path_spec.lua')

diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua
index 0d71872def..6b63a317f1 100644
--- a/test/functional/legacy/097_glob_path_spec.lua
+++ b/test/functional/legacy/097_glob_path_spec.lua
@@ -27,7 +27,7 @@ describe('glob() and globpath()', function()
     command([[$put =glob('Xxx\{')]])
     command([[$put =glob('Xxx\$')]])
 
-    command('w! Xxx{')
+    command('silent w! Xxx{')
     command([[w! Xxx\$]])
     command([[$put =glob('Xxx\{')]])
     command([[$put =glob('Xxx\$')]])
-- 
cgit