##// END OF EJS Templates
tests: fix Git on Windows sometimes failing on ' or ` in file:/// URLs...
domruf -
r5758:078136fd default
parent child Browse files
Show More
@@ -130,6 +130,7 b' class CompareController(BaseRepoControll'
130 else:
130 else:
131 # no changesets from other repo, ancestor is the other_rev
131 # no changesets from other repo, ancestor is the other_rev
132 ancestor = other_rev
132 ancestor = other_rev
133
133 # dulwich 0.9.9 doesn't have a Repo.close() so we have to mess with internals:
134 # dulwich 0.9.9 doesn't have a Repo.close() so we have to mess with internals:
134 gitrepo.object_store.close()
135 gitrepo.object_store.close()
135 gitrepo_remote.object_store.close()
136 gitrepo_remote.object_store.close()
@@ -46,7 +46,8 b' class GitRepositoryTest(unittest.TestCas'
46 # Verify correct quoting of evil characters that should work on posix file systems
46 # Verify correct quoting of evil characters that should work on posix file systems
47 if sys.platform == 'win32':
47 if sys.platform == 'win32':
48 # windows does not allow '"' in dir names
48 # windows does not allow '"' in dir names
49 tricky_path = get_new_dir("tricky-path-repo-$'`")
49 # and some versions of the git client don't like ` and '
50 tricky_path = get_new_dir("tricky-path-repo-$")
50 else:
51 else:
51 tricky_path = get_new_dir("tricky-path-repo-$'\"`")
52 tricky_path = get_new_dir("tricky-path-repo-$'\"`")
52 successfully_cloned = GitRepository(tricky_path, src_url=TEST_GIT_REPO, update_after_clone=True, create=True)
53 successfully_cloned = GitRepository(tricky_path, src_url=TEST_GIT_REPO, update_after_clone=True, create=True)
@@ -55,7 +56,8 b' class GitRepositoryTest(unittest.TestCas'
55
56
56 if sys.platform == 'win32':
57 if sys.platform == 'win32':
57 # windows does not allow '"' in dir names
58 # windows does not allow '"' in dir names
58 tricky_path_2 = get_new_dir("tricky-path-2-repo-$'`")
59 # and some versions of the git client don't like ` and '
60 tricky_path_2 = get_new_dir("tricky-path-2-repo-$")
59 else:
61 else:
60 tricky_path_2 = get_new_dir("tricky-path-2-repo-$'\"`")
62 tricky_path_2 = get_new_dir("tricky-path-2-repo-$'\"`")
61 successfully_cloned2 = GitRepository(tricky_path_2, src_url=tricky_path, bare=True, create=True)
63 successfully_cloned2 = GitRepository(tricky_path_2, src_url=tricky_path, bare=True, create=True)
General Comments 0
You need to be logged in to leave comments. Login now