Update test runner for more resilience (#1491)

- Autodetects vim versions, but asserts that they are as expected
- not fail silently on issues with sending data to Vim.

Code by @mymedia2, superseeds #1474.

test/test_ContextSnippets.py

@@ -57,9 +57,9 @@ class ContextSnippets_Before(_VimTest):
         endsnippet
         """
     }
-    word = 'Süßölgefäß'
-    keys = "adup" + EX + '\n' + word + 'dup' + EX
-    wanted = "adup" + EX + '\n' + word +'[' + word + ']'
+    word = "Süßölgefäß"
+    keys = "adup" + EX + "\n" + word + "dup" + EX
+    wanted = "adup" + EX + "\n" + word + "[" + word + "]"
 
 
 class ContextSnippets_UseContext(_VimTest):

test/test_Fixes.py

@@ -115,10 +115,13 @@ def _before_test(self):
 class PassThroughNonexecutedTrigger(_VimTest):
     snippets = ("text", "Expand me!", "", "")
     keys = (
-        "tex" + EX + # this should be passed through
-        "more\n" +
-        "text" + EX # this should be expanded
+        "tex"
+        + EX
+        + "more\n"  # this should be passed through
+        + "text"
+        + EX  # this should be expanded
     )
     wanted = "tex" + EX + "more\nExpand me!"
 
+
 # End: #1184

test/test_Interpolation.py

@@ -60,9 +60,9 @@ class TabStop_Shell_ShebangPython(_VimTest):
     snippets = (
         "test",
         """Hallo ${1:now `#!/usr/bin/env %s
-print "Hallo Welt"
+print("Hallo Welt")
 `} end"""
-        % (os.environ.get("PYTHON", "python2"),),
+        % os.environ.get("PYTHON", "python3"),
     )
     keys = "test" + EX + JF + "and more"
     wanted = "Hallo now Hallo Welt endand more"

test/vim_interface.py

@@ -22,7 +22,7 @@ def wait_until_file_exists(file_path, times=None, interval=0.01):
 
 
 def _read_text_file(filename):
-    """Reads the contens of a text file."""
+    """Reads the content of a text file."""
     with open(filename, "r", encoding="utf-8") as to_read:
         return to_read.read()
 
@@ -39,11 +39,6 @@ def is_process_running(pid):
         return True
 
 
-def silent_call(cmd):
-    """Calls 'cmd' and returns the exit value."""
-    return subprocess.call(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-
-
 def create_directory(dirname):
     """Creates 'dirname' and its parents if it does not exist."""
     try:
@@ -174,9 +169,11 @@ def _send(self, s):
         s = s.replace(";", r"\;")
 
         if len(s) == 1:
-            silent_call(["tmux", "send-keys", "-t", self.session, hex(ord(s))])
+            subprocess.check_call(
+                ["tmux", "send-keys", "-t", self.session, hex(ord(s))]
+            )
         else:
-            silent_call(["tmux", "send-keys", "-t", self.session, "-l", s])
+            subprocess.check_call(["tmux", "send-keys", "-t", self.session, "-l", s])
 
     def send_to_terminal(self, s):
         return self._send(s)

test_all.py

@@ -200,14 +200,27 @@ def main():
 
         all_test_suites = unittest.defaultTestLoader.discover(start_dir="test")
 
-        vim = None
-        vim_flavor = "vim"
+        has_nvim = subprocess.check_output(
+            [options.vim, "-e", "-s", "-c", "verbose echo has('nvim')", "+q"],
+            stderr=subprocess.STDOUT,
+        )
+        if has_nvim == b"0":
+            vim_flavor = "vim"
+        elif has_nvim == b"1":
+            vim_flavor = "neovim"
+        else:
+            assert 0, "Unexpected output, has_nvim=%r" % has_nvim
+
         if options.interface == "tmux":
+            assert vim_flavor == "vim", (
+                "Interface is tmux, but vim_flavor is %s" % vim_flavor
+            )
             vim = VimInterfaceTmux(options.vim, options.session)
-            vim_flavor = "vim"
         else:
+            assert vim_flavor == "neovim", (
+                "Interface is TmuxNeovim, but vim_flavor is %s" % vim_flavor
+            )
             vim = VimInterfaceTmuxNeovim(options.vim, options.session)
-            vim_flavor = "neovim"
 
         if not options.clone_plugins and platform.system() == "Windows":
             raise RuntimeError(