summaryrefslogtreecommitdiff
path: root/git/test/test_repo.py
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-10-04 15:46:18 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-10-11 18:56:04 +0200
commit09c88bec0588522afb820ee0dc704a936484cc45 (patch)
treee9ec87ff3ce05c66edf2a4bbe2863edaade4dbda /git/test/test_repo.py
parentaafde7d5a8046dc718843ca4b103fcb8a790332c (diff)
downloadgitpython-09c88bec0588522afb820ee0dc704a936484cc45.tar.gz
remote: unfix fetch-infos paring of 8a2f7dce4(pydev fixes)
+ Mark another TC failing when not in master.
Diffstat (limited to 'git/test/test_repo.py')
-rw-r--r--git/test/test_repo.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index b6359ad4..2c0847e1 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -909,6 +909,9 @@ class TestRepo(TestBase):
rw_master = self.rorepo.clone(join_path_native(rw_dir, 'master_repo'))
rw_master.git.checkout('HEAD~10')
worktree_path = join_path_native(rw_dir, 'worktree_repo')
- rw_master.git.worktree('add', worktree_path, 'master')
+ try:
+ rw_master.git.worktree('add', worktree_path, 'master')
+ except Exception as ex:
+ raise AssertionError(ex, "It's ok if TC not running from `master`.")
self.failUnlessRaises(InvalidGitRepositoryError, Repo, worktree_path)