changeset 854:50a09999dce3

tests: push_command: use svnserve.kill() in Python >=2.6
author Arne Babenhauserheide <arne.babenhauserheide@fzk.de>
date Thu, 12 Apr 2012 15:39:17 +0200
parents 8a226f0f99aa
children 258f60678791
files tests/test_push_command.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test_push_command.py
+++ b/tests/test_push_command.py
@@ -3,6 +3,7 @@ import test_util
 import atexit
 import errno
 import os
+import sys
 import random
 import shutil
 import socket
@@ -133,8 +134,10 @@ class PushTests(test_util.TestBase):
             self.assertNotEqual('an_author', tip.user())
             self.assertEqual('(no author)', tip.user().rsplit('@', 1)[0])
         finally:
-            # TODO: use svnserve.kill() in Python >2.5
-            test_util.kill_process(svnserve)
+            if sys.version_info >= (2,6):
+                svnserve.kill()
+            else: 
+                test_util.kill_process(svnserve)
 
     def test_push_over_svnserve(self):
         self.internal_push_over_svnserve()