diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-20 18:26:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-20 18:26:48 +0100 |
| commit | ddbe7d26b10c4374f406b807ae161826cf2096e1 (patch) | |
| tree | 707b9f2a20edc82251f0c1f14a8d315641211063 | |
| parent | 42d38a2db17e70312d073095257555c27a5f9443 (diff) | |
| download | vim-git-7.4.1370.tar.gz | |
patch 7.4.1370v7.4.1370
Problem: The Python test script may keep on running.
Solution: Join the threads. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/testdir/test_channel.py | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py index ec231e8c8..66fd48f43 100644 --- a/src/testdir/test_channel.py +++ b/src/testdir/test_channel.py @@ -192,3 +192,8 @@ if __name__ == "__main__": # Main thread terminates, but the server continues running # until server.shutdown() is called. + try: + while server_thread.isAlive(): + server_thread.join(1) + except (KeyboardInterrupt, SystemExit): + server.shutdown() diff --git a/src/version.c b/src/version.c index d857ed2d5..598d430bc 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1370, +/**/ 1369, /**/ 1368, |