Replace deprecated failUnlessRaises alias with assertRaises in tests

Author: Harmon758

git/test/lib/helper.py

@@ -331,7 +331,7 @@ class TestBase(TestCase):
 
     - Utility functions provided by the TestCase base of the unittest method such as::
         self.fail("todo")
-        self.failUnlessRaises(...)
+        self.assertRaises(...)
 
     - Class level repository which is considered read-only as it is shared among
       all test cases in your type.

git/test/test_blob.py

@@ -22,4 +22,4 @@ def test_mime_type_should_return_text_plain_for_unknown_types(self):
         assert_equal("text/plain", blob.mime_type)
 
     def test_nodict(self):
-        self.failUnlessRaises(AttributeError, setattr, self.rorepo.tree()['AUTHORS'], 'someattr', 2)
+        self.assertRaises(AttributeError, setattr, self.rorepo.tree()['AUTHORS'], 'someattr', 2)

git/test/test_commit.py

@@ -96,7 +96,7 @@ def test_bake(self):
 
         commit = self.rorepo.commit('2454ae89983a4496a445ce347d7a41c0bb0ea7ae')
         # commits have no dict
-        self.failUnlessRaises(AttributeError, setattr, commit, 'someattr', 1)
+        self.assertRaises(AttributeError, setattr, commit, 'someattr', 1)
         commit.author  # bake
 
         assert_equal("Sebastian Thiel", commit.author.name)
@@ -180,7 +180,7 @@ def test_traversal(self):
         self.assertEqual(next(start.traverse(branch_first=1, predicate=lambda i, d: i == p1)), p1)
 
         # traversal should stop when the beginning is reached
-        self.failUnlessRaises(StopIteration, next, first.traverse())
+        self.assertRaises(StopIteration, next, first.traverse())
 
         # parents of the first commit should be empty ( as the only parent has a null
         # sha )
@@ -206,7 +206,7 @@ def test_iteration(self):
 
     def test_iter_items(self):
         # pretty not allowed
-        self.failUnlessRaises(ValueError, Commit.iter_items, self.rorepo, 'master', pretty="raw")
+        self.assertRaises(ValueError, Commit.iter_items, self.rorepo, 'master', pretty="raw")
 
     def test_rev_list_bisect_all(self):
         """

git/test/test_db.py

@@ -24,4 +24,4 @@ def test_base(self):
 
         # fails with BadObject
         for invalid_rev in ("0000", "bad/ref", "super bad"):
-            self.failUnlessRaises(BadObject, gdb.partial_to_complete_sha_hex, invalid_rev)
+            self.assertRaises(BadObject, gdb.partial_to_complete_sha_hex, invalid_rev)

git/test/test_docs.py

@@ -232,7 +232,7 @@ def test_references_and_objects(self, rw_dir):
         # [6-test_references_and_objects]
         new_tag = repo.create_tag('my_new_tag', message='my message')
         # You cannot change the commit a tag points to. Tags need to be re-created
-        self.failUnlessRaises(AttributeError, setattr, new_tag, 'commit', repo.commit('HEAD~1'))
+        self.assertRaises(AttributeError, setattr, new_tag, 'commit', repo.commit('HEAD~1'))
         repo.delete_tag(new_tag)
         # ![6-test_references_and_objects]
 
@@ -441,7 +441,7 @@ def test_references_and_objects(self, rw_dir):
 
         # [30-test_references_and_objects]
         # checkout the branch using git-checkout. It will fail as the working tree appears dirty
-        self.failUnlessRaises(git.GitCommandError, repo.heads.master.checkout)
+        self.assertRaises(git.GitCommandError, repo.heads.master.checkout)
         repo.heads.past_branch.checkout()
         # ![30-test_references_and_objects]
 

git/test/test_fun.py

@@ -70,7 +70,7 @@ def test_aggressive_tree_merge(self):
         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"""

git/test/test_git.py

@@ -175,7 +175,7 @@ def test_cmd_override(self):
             # set it to something that doens't exist, assure it raises
             type(self.git).GIT_PYTHON_GIT_EXECUTABLE = osp.join(
                 "some", "path", "which", "doesn't", "exist", "gitbinary")
-            self.failUnlessRaises(exc, self.git.version)
+            self.assertRaises(exc, self.git.version)
         finally:
             type(self.git).GIT_PYTHON_GIT_EXECUTABLE = prev_cmd
         # END undo adjustment
@@ -219,7 +219,7 @@ def test_change_to_transform_kwargs_does_not_break_command_options(self):
 
     def test_insert_after_kwarg_raises(self):
         # This isn't a complete add command, which doesn't matter here
-        self.failUnlessRaises(ValueError, self.git.remote, 'add', insert_kwargs_after='foo')
+        self.assertRaises(ValueError, self.git.remote, 'add', insert_kwargs_after='foo')
 
     def test_env_vars_passed_to_git(self):
         editor = 'non_existent_editor'

git/test/test_index.py

@@ -205,7 +205,7 @@ def test_index_file_from_tree(self, rw_repo):
             assert blob.path.startswith(prefix)
 
         # writing a tree should fail with an unmerged index
-        self.failUnlessRaises(UnmergedEntriesError, three_way_index.write_tree)
+        self.assertRaises(UnmergedEntriesError, three_way_index.write_tree)
 
         # removed unmerged entries
         unmerged_blob_map = three_way_index.unmerged_blobs()
@@ -265,13 +265,13 @@ def test_index_merge_tree(self, rw_repo):
         # a three way merge would result in a conflict and fails as the command will
         # not overwrite any entries in our index and hence leave them unmerged. This is
         # mainly a protection feature as the current index is not yet in a tree
-        self.failUnlessRaises(GitCommandError, index.merge_tree, next_commit, base=parent_commit)
+        self.assertRaises(GitCommandError, index.merge_tree, next_commit, base=parent_commit)
 
         # the only way to get the merged entries is to safe the current index away into a tree,
         # which is like a temporary commit for us. This fails as well as the NULL sha deos not
         # have a corresponding object
         # NOTE: missing_ok is not a kwarg anymore, missing_ok is always true
-        # self.failUnlessRaises(GitCommandError, index.write_tree)
+        # self.assertRaises(GitCommandError, index.write_tree)
 
         # if missing objects are okay, this would work though ( they are always okay now )
         # As we can't read back the tree with NULL_SHA, we rather set it to something else
@@ -326,7 +326,7 @@ def test_index_file_diffing(self, rw_repo):
         assert wdiff != odiff
 
         # against something unusual
-        self.failUnlessRaises(ValueError, index.diff, int)
+        self.assertRaises(ValueError, index.diff, int)
 
         # adjust the index to match an old revision
         cur_branch = rw_repo.active_branch
@@ -375,8 +375,8 @@ def test_index_file_diffing(self, rw_repo):
         assert osp.exists(test_file)
 
         # checking out non-existing file throws
-        self.failUnlessRaises(CheckoutError, index.checkout, "doesnt_exist_ever.txt.that")
-        self.failUnlessRaises(CheckoutError, index.checkout, paths=["doesnt/exist"])
+        self.assertRaises(CheckoutError, index.checkout, "doesnt_exist_ever.txt.that")
+        self.assertRaises(CheckoutError, index.checkout, paths=["doesnt/exist"])
 
         # checkout file with modifications
         append_data = b"hello"
@@ -474,12 +474,12 @@ def mixed_iterator():
         self.assertEqual(self._count_existing(rw_repo, deleted_files), len(deleted_files))
 
         # invalid type
-        self.failUnlessRaises(TypeError, index.remove, [1])
+        self.assertRaises(TypeError, index.remove, [1])
 
         # absolute path
         deleted_files = index.remove([osp.join(rw_repo.working_tree_dir, "lib")], r=True)
         assert len(deleted_files) > 1
-        self.failUnlessRaises(ValueError, index.remove, ["/doesnt/exists"])
+        self.assertRaises(ValueError, index.remove, ["/doesnt/exists"])
 
         # TEST COMMITTING
         # commit changed index
@@ -571,7 +571,7 @@ def mixed_iterator():
         self.assertEqual(len(entries), 2)
 
         # missing path
-        self.failUnlessRaises(OSError, index.reset(new_commit).add, ['doesnt/exist/must/raise'])
+        self.assertRaises(OSError, index.reset(new_commit).add, ['doesnt/exist/must/raise'])
 
         # blob from older revision overrides current index revision
         old_blob = new_commit.parents[0].tree.blobs[0]
@@ -584,7 +584,7 @@ def mixed_iterator():
         # mode 0 not allowed
         null_hex_sha = Diff.NULL_HEX_SHA
         null_bin_sha = b"\0" * 20
-        self.failUnlessRaises(ValueError, index.reset(
+        self.assertRaises(ValueError, index.reset(
             new_commit).add, [BaseIndexEntry((0, null_bin_sha, 0, "doesntmatter"))])
 
         # add new file
@@ -668,10 +668,10 @@ def assert_mv_rval(rval):
             # END for each renamed item
         # END move assertion utility
 
-        self.failUnlessRaises(ValueError, index.move, ['just_one_path'])
+        self.assertRaises(ValueError, index.move, ['just_one_path'])
         # file onto existing file
         files = ['AUTHORS', 'LICENSE']
-        self.failUnlessRaises(GitCommandError, index.move, files)
+        self.assertRaises(GitCommandError, index.move, files)
 
         # again, with force
         assert_mv_rval(index.move(files, f=True))

git/test/test_reflog.py

@@ -23,7 +23,7 @@ def test_reflogentry(self):
         actor = Actor('name', 'email')
         msg = "message"
 
-        self.failUnlessRaises(ValueError, RefLogEntry.new, nullhexsha, hexsha, 'noactor', 0, 0, "")
+        self.assertRaises(ValueError, RefLogEntry.new, nullhexsha, hexsha, 'noactor', 0, 0, "")
         e = RefLogEntry.new(nullhexsha, hexsha, actor, 0, 1, msg)
 
         assert e.oldhexsha == nullhexsha
@@ -59,11 +59,11 @@ def test_base(self):
         # TODO: Try multiple corrupted ones !
         pp = 'reflog_invalid_'
         for suffix in ('oldsha', 'newsha', 'email', 'date', 'sep'):
-            self.failUnlessRaises(ValueError, RefLog.from_file, fixture_path(pp + suffix))
+            self.assertRaises(ValueError, RefLog.from_file, fixture_path(pp + suffix))
         # END for each invalid file
 
         # cannot write an uninitialized reflog
-        self.failUnlessRaises(ValueError, RefLog().write)
+        self.assertRaises(ValueError, RefLog().write)
 
         # test serialize and deserialize - results must match exactly
         binsha = hex_to_bin(('f' * 40).encode('ascii'))
@@ -91,7 +91,7 @@ def test_base(self):
 
             # index entry
             # raises on invalid index
-            self.failUnlessRaises(IndexError, RefLog.entry_at, rlp, 10000)
+            self.assertRaises(IndexError, RefLog.entry_at, rlp, 10000)
 
             # indices can be positive ...
             assert isinstance(RefLog.entry_at(rlp, 0), RefLogEntry)

git/test/test_refs.py

@@ -40,7 +40,7 @@ def test_from_path(self):
         # END for each type
 
         # invalid path
-        self.failUnlessRaises(ValueError, TagReference, self.rorepo, "refs/invalid/tag")
+        self.assertRaises(ValueError, TagReference, self.rorepo, "refs/invalid/tag")
         # works without path check
         TagReference(self.rorepo, "refs/invalid/tag", check_path=False)
 
@@ -54,7 +54,7 @@ def test_tag_base(self):
                 tag_object_refs.append(tag)
                 tagobj = tag.tag
                 # have no dict
-                self.failUnlessRaises(AttributeError, setattr, tagobj, 'someattr', 1)
+                self.assertRaises(AttributeError, setattr, tagobj, 'someattr', 1)
                 assert isinstance(tagobj, TagObject)
                 assert tagobj.tag == tag.name
                 assert isinstance(tagobj.tagger, Actor)
@@ -63,7 +63,7 @@ def test_tag_base(self):
                 assert tagobj.message
                 assert tag.object == tagobj
                 # can't assign the object
-                self.failUnlessRaises(AttributeError, setattr, tag, 'object', tagobj)
+                self.assertRaises(AttributeError, setattr, tag, 'object', tagobj)
             # END if we have a tag object
         # END for tag in repo-tags
         assert tag_object_refs
@@ -201,7 +201,7 @@ def test_head_reset(self, rw_repo):
         cur_head.reset(new_head_commit, index=True)  # index only
         assert cur_head.reference.commit == new_head_commit
 
-        self.failUnlessRaises(ValueError, cur_head.reset, new_head_commit, index=False, working_tree=True)
+        self.assertRaises(ValueError, cur_head.reset, new_head_commit, index=False, working_tree=True)
         new_head_commit = new_head_commit.parents[0]
         cur_head.reset(new_head_commit, index=True, working_tree=True)  # index + wt
         assert cur_head.reference.commit == new_head_commit
@@ -211,7 +211,7 @@ def test_head_reset(self, rw_repo):
         cur_head.reset(cur_head, paths="test")
         cur_head.reset(new_head_commit, paths="lib")
         # hard resets with paths don't work, its all or nothing
-        self.failUnlessRaises(GitCommandError, cur_head.reset, new_head_commit, working_tree=True, paths="lib")
+        self.assertRaises(GitCommandError, cur_head.reset, new_head_commit, working_tree=True, paths="lib")
 
         # we can do a mixed reset, and then checkout from the index though
         cur_head.reset(new_head_commit)
@@ -235,7 +235,7 @@ def test_head_reset(self, rw_repo):
         cur_head.reference = curhead_commit
         assert cur_head.commit == curhead_commit
         assert cur_head.is_detached
-        self.failUnlessRaises(TypeError, getattr, cur_head, "reference")
+        self.assertRaises(TypeError, getattr, cur_head, "reference")
 
         # tags are references, hence we can point to them
         some_tag = rw_repo.tags[0]
@@ -248,7 +248,7 @@ def test_head_reset(self, rw_repo):
         cur_head.reference = active_head
 
         # type check
-        self.failUnlessRaises(ValueError, setattr, cur_head, "reference", "that")
+        self.assertRaises(ValueError, setattr, cur_head, "reference", "that")
 
         # head handling
         commit = 'HEAD'
@@ -263,7 +263,7 @@ def test_head_reset(self, rw_repo):
             Head.create(rw_repo, new_name, new_head.commit)
 
             # its not fine with a different value
-            self.failUnlessRaises(OSError, Head.create, rw_repo, new_name, new_head.commit.parents[0])
+            self.assertRaises(OSError, Head.create, rw_repo, new_name, new_head.commit.parents[0])
 
             # force it
             new_head = Head.create(rw_repo, new_name, actual_commit, force=True)
@@ -276,7 +276,7 @@ def test_head_reset(self, rw_repo):
 
             # rename with force
             tmp_head = Head.create(rw_repo, "tmphead")
-            self.failUnlessRaises(GitCommandError, tmp_head.rename, new_head)
+            self.assertRaises(GitCommandError, tmp_head.rename, new_head)
             tmp_head.rename(new_head, force=True)
             assert tmp_head == new_head and tmp_head.object == new_head.object
 
@@ -289,12 +289,12 @@ def test_head_reset(self, rw_repo):
             assert tmp_head not in heads and new_head not in heads
             # force on deletion testing would be missing here, code looks okay though ;)
         # END for each new head name
-        self.failUnlessRaises(TypeError, RemoteReference.create, rw_repo, "some_name")
+        self.assertRaises(TypeError, RemoteReference.create, rw_repo, "some_name")
 
         # tag ref
         tag_name = "5.0.2"
         TagReference.create(rw_repo, tag_name)
-        self.failUnlessRaises(GitCommandError, TagReference.create, rw_repo, tag_name)
+        self.assertRaises(GitCommandError, TagReference.create, rw_repo, tag_name)
         light_tag = TagReference.create(rw_repo, tag_name, "HEAD~1", force=True)
         assert isinstance(light_tag, TagReference)
         assert light_tag.name == tag_name
@@ -354,13 +354,13 @@ def test_head_reset(self, rw_repo):
 
         # setting a non-commit as commit fails, but succeeds as object
         head_tree = head.commit.tree
-        self.failUnlessRaises(ValueError, setattr, head, 'commit', head_tree)
+        self.assertRaises(ValueError, setattr, head, 'commit', head_tree)
         assert head.commit == old_commit        # and the ref did not change
         # we allow heds to point to any object
         head.object = head_tree
         assert head.object == head_tree
         # cannot query tree as commit
-        self.failUnlessRaises(TypeError, getattr, head, 'commit')
+        self.assertRaises(TypeError, getattr, head, 'commit')
 
         # set the commit directly using the head. This would never detach the head
         assert not cur_head.is_detached
@@ -397,7 +397,7 @@ def test_head_reset(self, rw_repo):
 
         # create a new branch that is likely to touch the file we changed
         far_away_head = rw_repo.create_head("far_head", 'HEAD~100')
-        self.failUnlessRaises(GitCommandError, far_away_head.checkout)
+        self.assertRaises(GitCommandError, far_away_head.checkout)
         assert active_branch == active_branch.checkout(force=True)
         assert rw_repo.head.reference != far_away_head
 
@@ -408,7 +408,7 @@ def test_head_reset(self, rw_repo):
         assert ref.path == full_ref
         assert ref.object == rw_repo.head.commit
 
-        self.failUnlessRaises(OSError, Reference.create, rw_repo, full_ref, 'HEAD~20')
+        self.assertRaises(OSError, Reference.create, rw_repo, full_ref, 'HEAD~20')
         # it works if it is at the same spot though and points to the same reference
         assert Reference.create(rw_repo, full_ref, 'HEAD').path == full_ref
         Reference.delete(rw_repo, full_ref)
@@ -434,11 +434,11 @@ def test_head_reset(self, rw_repo):
         # END for each name type
 
         # References that don't exist trigger an error if we want to access them
-        self.failUnlessRaises(ValueError, getattr, Reference(rw_repo, "refs/doesntexist"), 'commit')
+        self.assertRaises(ValueError, getattr, Reference(rw_repo, "refs/doesntexist"), 'commit')
 
         # exists, fail unless we force
         ex_ref_path = far_away_head.path
-        self.failUnlessRaises(OSError, ref.rename, ex_ref_path)
+        self.assertRaises(OSError, ref.rename, ex_ref_path)
         # if it points to the same commit it works
         far_away_head.commit = ref.commit
         ref.rename(ex_ref_path)
@@ -451,7 +451,7 @@ def test_head_reset(self, rw_repo):
         assert symref.path == symref_path
         assert symref.reference == cur_head.reference
 
-        self.failUnlessRaises(OSError, SymbolicReference.create, rw_repo, symref_path, cur_head.reference.commit)
+        self.assertRaises(OSError, SymbolicReference.create, rw_repo, symref_path, cur_head.reference.commit)
         # it works if the new ref points to the same reference
         SymbolicReference.create(rw_repo, symref.path, symref.reference).path == symref.path  # @NoEffect
         SymbolicReference.delete(rw_repo, symref)
@@ -541,7 +541,7 @@ def test_head_reset(self, rw_repo):
             # if the assignment raises, the ref doesn't exist
             Reference.delete(ref.repo, ref.path)
             assert not ref.is_valid()
-            self.failUnlessRaises(ValueError, setattr, ref, 'commit', "nonsense")
+            self.assertRaises(ValueError, setattr, ref, 'commit', "nonsense")
             assert not ref.is_valid()
 
             # I am sure I had my reason to make it a class method at first, but
@@ -555,7 +555,7 @@ def test_head_reset(self, rw_repo):
 
             Reference.delete(ref.repo, ref.path)
             assert not ref.is_valid()
-            self.failUnlessRaises(ValueError, setattr, ref, 'object', "nonsense")
+            self.assertRaises(ValueError, setattr, ref, 'object', "nonsense")
             assert not ref.is_valid()
 
         # END for each path