Mercurial > hgsubversion

comparison tests/test_push_command.py @ 854:50a09999dce3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 27a2136e89cd
children 04729f3a3d17
comparison
equal deleted inserted replaced
852:8a226f0f99aa 854:50a09999dce3
1 import test_util 1 import test_util
2 2
3 import atexit 3 import atexit
4 import errno 4 import errno
5 import os 5 import os
6 import sys
6 import random 7 import random
7 import shutil 8 import shutil
8 import socket 9 import socket
9 import subprocess 10 import subprocess
10 import unittest 11 import unittest
131 self.assertEqual(tip.branch(), 'default') 132 self.assertEqual(tip.branch(), 'default')
132 # unintended behaviour: 133 # unintended behaviour:
133 self.assertNotEqual('an_author', tip.user()) 134 self.assertNotEqual('an_author', tip.user())
134 self.assertEqual('(no author)', tip.user().rsplit('@', 1)[0]) 135 self.assertEqual('(no author)', tip.user().rsplit('@', 1)[0])
135 finally: 136 finally:
136 # TODO: use svnserve.kill() in Python >2.5 137 if sys.version_info >= (2,6):
137 test_util.kill_process(svnserve) 138 svnserve.kill()
139 else:
140 test_util.kill_process(svnserve)
138 141
139 def test_push_over_svnserve(self): 142 def test_push_over_svnserve(self):
140 self.internal_push_over_svnserve() 143 self.internal_push_over_svnserve()
141 144
142 def test_push_over_svnserve_with_subdir(self): 145 def test_push_over_svnserve_with_subdir(self):