Merge lp:~blueyed/ultisnips/improve-test-script into lp:~sirver/ultisnips/trunk

[Daniel Hahler]

[SirVer (sirver)]

I am d'accord with the set clipboard part. I find the other solution with the cd not really needed - I see no benefit in it as you will likely be in the correct directory when hacking on UltiSnips.

I disagree with the TODO. there is very little manual labor involved setting up the test environment and sensing if one is inside a screen session is error prone at best. I added your lines 31-33 for now. Please comment here if you really want all of your patch commited.

I also added you to the list of contributors in the Doc. Thanks for sharing this fix!

review: Approve

=== modified file 'test.py'
--- test.py	2011-02-21 08:34:12 +0000
+++ test.py	2011-03-07 22:51:47 +0000
@@ -2,9 +2,7 @@
 # encoding: utf-8
 #
 # To execute this test requires two terminals, one for running Vim and one
-# for executing the test script.  Both terminals should have their current
-# working directories set to this directory (the one containing this test.py
-# script).
+# for executing the test script.
 #
 # In one terminal, launch a GNU ``screen`` session named ``vim``:
 #   $ screen -S vim
@@ -2283,6 +2281,11 @@
 
     options,selected_tests = parse_args()
 
+    # TODO: make sure vim is running in screen. If it is not possible to get
+    # info about the currently running program, we might want to start a new
+    # screen session for each test script run (and start "vim -u NONE" there
+    # initially)
+
     # The next line doesn't work in python 2.3
     test_loader = unittest.TestLoader()
     all_test_suites = test_loader.loadTestsFromModule(__import__("test"))
@@ -2290,6 +2293,9 @@
     # Ensure we are not running in VI-compatible mode.
     send(""":set nocompatible\n""", options.session)
 
+    # Do not mess with the X clipboard
+    send(""":set clipboard=""\n""", options.session)
+
     # Ensure runtimepath includes only Vim's own runtime files
     # and those of the UltiSnips directory under test ('.').
     send(""":set runtimepath=$VIMRUNTIME,.\n""", options.session)
@@ -2300,6 +2306,10 @@
     send(""":let g:UltiSnipsJumpBackwardTrigger="+"\n""", options.session)
     send(""":let g:UltiSnipsListSnippets="@"\n""", options.session)
 
+    # Change to the script directory in Vim
+    scriptdir = os.path.dirname(os.path.abspath(__file__))
+    send(""":cd %s\n""" % (scriptdir.replace(" ", "\\ "),), options.session)
+
     # Now, source our runtime
     send(":so plugin/UltiSnips.vim\n", options.session)
     time.sleep(2) # Parsing and initializing UltiSnips takes a while.