diff options
| author | Qijiang Fan <fqj1994@gmail.com> | 2011-10-25 12:37:40 +0800 |
|---|---|---|
| committer | Qijiang Fan <fqj1994@gmail.com> | 2011-10-25 12:37:40 +0800 |
| commit | 4d96cae645ca33d56b4a4961f2b59bef82773b58 (patch) | |
| tree | 3a7085b11447f986526447bceca48170e3602af4 /tests/test_fetch_mappings.py | |
| parent | 6e8f1b6597c85527b4721f376e0360bb25543cc8 (diff) | |
Upstream version 1.3
Diffstat (limited to 'tests/test_fetch_mappings.py')
| -rw-r--r-- | tests/test_fetch_mappings.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/test_fetch_mappings.py b/tests/test_fetch_mappings.py index 2eba177..83149ef 100644 --- a/tests/test_fetch_mappings.py +++ b/tests/test_fetch_mappings.py @@ -26,7 +26,7 @@ class MapTests(test_util.TestBase): @property def branchmap(self): return os.path.join(self.tmpdir, 'branchmap') - + @property def tagmap(self): return os.path.join(self.tmpdir, 'tagmap') @@ -96,8 +96,8 @@ class MapTests(test_util.TestBase): test = maps.AuthorMap(self.ui(), self.authors) fromself = set(test) test.load(orig) - all = set(test) - self.assertEqual(fromself.symmetric_difference(all), set()) + all_tests = set(test) + self.assertEqual(fromself.symmetric_difference(all_tests), set()) def test_file_map(self, stupid=False): test_util.load_svndump_fixture(self.repo_path, 'replace_trunk_with_branch.svndump') @@ -112,7 +112,8 @@ class MapTests(test_util.TestBase): self.assertEqual(node.hex(self.repo['default'].node()), 'e524296152246b3837fe9503c83b727075835155') def test_file_map_stupid(self): - self.test_file_map(True) + # TODO: re-enable test if we ever reinstate this feature + self.assertRaises(hgutil.Abort, self.test_file_map, True) def test_file_map_exclude(self, stupid=False): test_util.load_svndump_fixture(self.repo_path, 'replace_trunk_with_branch.svndump') @@ -127,7 +128,8 @@ class MapTests(test_util.TestBase): self.assertEqual(node.hex(self.repo['default'].node()), 'b37a3c0297b71f989064d9b545b5a478bbed7cc1') def test_file_map_exclude_stupid(self): - self.test_file_map_exclude(True) + # TODO: re-enable test if we ever reinstate this feature + self.assertRaises(hgutil.Abort, self.test_file_map_exclude, True) def test_branchmap(self, stupid=False): test_util.load_svndump_fixture(self.repo_path, 'branchmap.svndump') @@ -220,8 +222,8 @@ class MapTests(test_util.TestBase): # clone & rebuild ui = self.ui(stupid) - src, dest = hg.clone(ui, self.wc_path, self.wc_path + '_clone', - update=False) + src, dest = test_util.hgclone(ui, self.wc_path, self.wc_path + '_clone', + update=False) svncommands.rebuildmeta(ui, dest, args=[test_util.fileurl(self.repo_path)]) |