summaryrefslogtreecommitdiff
path: root/git/test
diff options
context:
space:
mode:
Diffstat (limited to 'git/test')
-rw-r--r--git/test/test_repo.py4
-rw-r--r--git/test/test_submodule.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index c583fcae..c32dbdbf 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -591,8 +591,8 @@ class TestRepo(TestBase):
commit = rev_parse(first_rev)
assert len(commit.parents) == 0
assert commit.hexsha == first_rev
- self.failUnlessRaises(BadObject, rev_parse, first_rev + "~")
- self.failUnlessRaises(BadObject, rev_parse, first_rev + "^")
+ self.failUnlessRaises(BadName, rev_parse, first_rev + "~")
+ self.failUnlessRaises(BadName, rev_parse, first_rev + "^")
# short SHA1
commit2 = rev_parse(first_rev[:20])
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index b9502f75..6a03fe26 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -535,7 +535,7 @@ class TestSubmodule(TestBase):
touch(nsm_file)
nsm.module().index.add([nsm])
nsm.module().index.commit("added new file")
- rm.update(recursive=False, dry_run=True, progress=prog) # would not change head, and thus doens't fail
+ rm.update(recursive=False, dry_run=True, progress=prog) # would not change head, and thus doens't fail
# Everything we can do from now on will trigger the 'future' check, so no is_dirty() check will even run
# This would only run if our local branch is in the past and we have uncommitted changes
@@ -691,7 +691,7 @@ class TestSubmodule(TestBase):
def assert_exists(sm, value=True):
assert sm.exists() == value
assert sm.module_exists() == value
- # end
+ # end
# As git is backwards compatible itself, it would still recognize what we do here ... unless we really
# muss it up. That's the only reason why the test is still here ... .