Mercurial > hgsubversion
comparison tests/test_push_command.py @ 625:96552e855d7e
tests: fix misnamed test caught while hunting unrelated bugs
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sun, 27 Jun 2010 21:14:36 -0500 |
parents | d96aa92d9ad9 |
children | 8e621dbb82d4 |
comparison
equal
deleted
inserted
replaced
624:cc25b4c654dc | 625:96552e855d7e |
---|---|
264 tip = self.repo['tip'] | 264 tip = self.repo['tip'] |
265 self.assertNotEqual(tip.node(), new_hash) | 265 self.assertNotEqual(tip.node(), new_hash) |
266 self.assertEqual(tip['adding_file'].data(), 'foo') | 266 self.assertEqual(tip['adding_file'].data(), 'foo') |
267 self.assertEqual(tip.branch(), 'the_branch') | 267 self.assertEqual(tip.branch(), 'the_branch') |
268 | 268 |
269 def push_to_non_tip(self): | 269 def test_push_to_non_tip(self): |
270 self.test_push_to_branch(push=False) | 270 self.test_push_to_branch(push=False) |
271 wc2path = self.wc_path + '_clone' | 271 wc2path = self.wc_path + '_clone' |
272 u = self.repo.ui | 272 u = self.repo.ui |
273 hg.clone(self.repo.ui, self.wc_path, wc2path, update=False) | 273 hg.clone(self.repo.ui, self.wc_path, wc2path, update=False) |
274 self.pushrevisions() | 274 self.pushrevisions() |
287 parent='default', | 287 parent='default', |
288 message='commit to default') | 288 message='commit to default') |
289 from hgsubversion import svncommands | 289 from hgsubversion import svncommands |
290 svncommands.rebuildmeta(u, | 290 svncommands.rebuildmeta(u, |
291 self.repo, | 291 self.repo, |
292 os.path.dirname(self.repo.path), | |
293 args=[test_util.fileurl(self.repo_path)]) | 292 args=[test_util.fileurl(self.repo_path)]) |
294 | 293 |
295 | 294 |
296 hg.update(self.repo, self.repo['tip'].node()) | 295 hg.update(self.repo, self.repo['tip'].node()) |
297 oldnode = self.repo['tip'].hex() | 296 oldnode = self.repo['tip'].hex() |