Mercurial > hgsubversion
comparison tests/test_push_command.py @ 484:c2d0e738c899
Merge win32 fixes
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Sat, 08 Aug 2009 08:01:24 -0500 |
| parents | db3a53a2cd76 37718f514acb |
| children | cf4fe45bf8fd |
comparison
equal
deleted
inserted
replaced
| 477:3855865ba53d | 484:c2d0e738c899 |
|---|---|
| 129 self.assertEqual(tip.branch(), 'default') | 129 self.assertEqual(tip.branch(), 'default') |
| 130 # unintended behaviour: | 130 # unintended behaviour: |
| 131 self.assertNotEqual('an_author', tip.user()) | 131 self.assertNotEqual('an_author', tip.user()) |
| 132 self.assertEqual('None', tip.user().rsplit('@', 1)[0]) | 132 self.assertEqual('None', tip.user().rsplit('@', 1)[0]) |
| 133 finally: | 133 finally: |
| 134 os.kill(self.svnserve_pid, 9) | 134 # TODO: use svnserve.kill() in Python >2.5 |
| 135 test_util.kill_process(svnserve) | |
| 135 | 136 |
| 136 def test_push_to_default(self, commit=True): | 137 def test_push_to_default(self, commit=True): |
| 137 repo = self.repo | 138 repo = self.repo |
| 138 old_tip = repo['tip'].node() | 139 old_tip = repo['tip'].node() |
| 139 expected_parent = repo['default'].node() | 140 expected_parent = repo['default'].node() |
