comparison tests/test_single_dir_clone.py @ 866:20e73b5ab6f7

test_util: merge load_svndump_fixture() into TestBase
author Patrick Mezard <patrick@mezard.eu>
date Thu, 19 Apr 2012 18:29:28 +0200
parents 312b37bc5e20
children cc1c870f1758
comparison
equal deleted inserted replaced
865:04729f3a3d17 866:20e73b5ab6f7
227 227
228 @test_util.requiresoption('branch') 228 @test_util.requiresoption('branch')
229 def test_push_single_dir_renamed_branch(self, stupid=False): 229 def test_push_single_dir_renamed_branch(self, stupid=False):
230 # Tests pulling and pushing with a renamed branch 230 # Tests pulling and pushing with a renamed branch
231 # Based on test_push_single_dir 231 # Based on test_push_single_dir
232 test_util.load_svndump_fixture(self.repo_path, 232 repo_path = self.load_svndump('branch_from_tag.svndump')
233 'branch_from_tag.svndump')
234 cmd = ['clone', '--layout=single', '--branch=flaf'] 233 cmd = ['clone', '--layout=single', '--branch=flaf']
235 if stupid: 234 if stupid:
236 cmd.append('--stupid') 235 cmd.append('--stupid')
237 cmd += [test_util.fileurl(self.repo_path), self.wc_path] 236 cmd += [test_util.fileurl(repo_path), self.wc_path]
238 test_util.dispatch(cmd) 237 test_util.dispatch(cmd)
239 238
240 def file_callback(repo, memctx, path): 239 def file_callback(repo, memctx, path):
241 if path == 'adding_file': 240 if path == 'adding_file':
242 return context.memfilectx(path=path, 241 return context.memfilectx(path=path,