comparison tests/test_pull.py @ 1106:5cb6c95e0283 stable

Merge default and stable so I can do stable releases again.
author Augie Fackler <raf@durin42.com>
date Tue, 11 Feb 2014 12:48:49 -0500
parents cd35f6739669
children 61d4fb78370b
comparison
equal deleted inserted replaced
1020:b5b1fce26f1f 1106:5cb6c95e0283
12 def setUp(self): 12 def setUp(self):
13 super(TestPull, self).setUp() 13 super(TestPull, self).setUp()
14 14
15 def _loadupdate(self, fixture_name, *args, **kwargs): 15 def _loadupdate(self, fixture_name, *args, **kwargs):
16 kwargs = kwargs.copy() 16 kwargs = kwargs.copy()
17 kwargs.update(stupid=False, noupdate=False) 17 kwargs.update(noupdate=False)
18 repo, repo_path = self.load_and_fetch(fixture_name, *args, **kwargs) 18 repo, repo_path = self.load_and_fetch(fixture_name, *args, **kwargs)
19 return repo, repo_path 19 return repo, repo_path
20 20
21 def test_nochanges(self): 21 def test_nochanges(self):
22 self._loadupdate('single_rev.svndump') 22 self._loadupdate('single_rev.svndump')
77 repo.ui.setconfig('hgsubversion', 'unsafeskip', '3 4') 77 repo.ui.setconfig('hgsubversion', 'unsafeskip', '3 4')
78 commands.pull(repo.ui, repo) 78 commands.pull(repo.ui, repo)
79 tip = repo['tip'].rev() 79 tip = repo['tip'].rev()
80 self.assertEqual(tip, 1) 80 self.assertEqual(tip, 1)
81 self.assertEquals(verify.verify(repo.ui, repo, rev=tip), 0) 81 self.assertEquals(verify.verify(repo.ui, repo, rev=tip), 0)
82
83 def suite():
84 import unittest, sys
85 return unittest.findTestCases(sys.modules[__name__])