summaryrefslogtreecommitdiff
path: root/git/test/test_fun.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/test/test_fun.py')
-rw-r--r--git/test/test_fun.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 612c4c5d..594e8fab 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -70,7 +70,7 @@ class TestFun(TestBase):
self._assert_index_entries(aggressive_tree_merge(odb, trees), trees)
# too many trees
- self.failUnlessRaises(ValueError, aggressive_tree_merge, odb, trees * 2)
+ self.assertRaises(ValueError, aggressive_tree_merge, odb, trees * 2)
def mktree(self, odb, entries):
"""create a tree from the given tree entries and safe it to the database"""