Skip to content

Commit dff15cd

Browse files
hugovkByron
authored andcommitted
Replace deprecated unittest aliases
1 parent 03ab3a1 commit dff15cd

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

gitdb/test/db/lib.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ def _assert_object_writing(self, db):
102102
assert ostream.type == str_blob_type
103103
assert ostream.size == len(data)
104104
else:
105-
self.failUnlessRaises(BadObject, db.info, sha)
106-
self.failUnlessRaises(BadObject, db.stream, sha)
105+
self.assertRaises(BadObject, db.info, sha)
106+
self.assertRaises(BadObject, db.stream, sha)
107107

108108
# DIRECT STREAM COPY
109109
# our data hase been written in object format to the StringIO

gitdb/test/db/test_git.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_reading(self):
4343
assert gdb.partial_to_complete_sha_hex(bin_to_hex(binsha)[:8 - (i % 2)]) == binsha
4444
# END for each sha
4545

46-
self.failUnlessRaises(BadObject, gdb.partial_to_complete_sha_hex, "0000")
46+
self.assertRaises(BadObject, gdb.partial_to_complete_sha_hex, "0000")
4747

4848
@with_rw_directory
4949
def test_writing(self, path):

gitdb/test/db/test_loose.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ def test_basics(self, path):
3232
assert bin_to_hex(ldb.partial_to_complete_sha_hex(short_sha)) == long_sha
3333
# END for each sha
3434

35-
self.failUnlessRaises(BadObject, ldb.partial_to_complete_sha_hex, '0000')
35+
self.assertRaises(BadObject, ldb.partial_to_complete_sha_hex, '0000')
3636
# raises if no object could be found

gitdb/test/db/test_pack.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ def test_writing(self, path):
8484
# assert num_ambiguous
8585

8686
# non-existing
87-
self.failUnlessRaises(BadObject, pdb.partial_to_complete_sha, b'\0\0', 4)
87+
self.assertRaises(BadObject, pdb.partial_to_complete_sha, b'\0\0', 4)

gitdb/test/test_pack.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def _assert_index_file(self, index, version, size):
7373
assert index.partial_sha_to_index(sha[:l], l * 2) == oidx
7474

7575
# END for each object index in indexfile
76-
self.failUnlessRaises(ValueError, index.partial_sha_to_index, "\0", 2)
76+
self.assertRaises(ValueError, index.partial_sha_to_index, "\0", 2)
7777

7878
def _assert_pack_file(self, pack, version, size):
7979
assert pack.version() == 2

gitdb/test/test_stream.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def test_compressed_writer(self):
135135
ostream.close()
136136

137137
# its closed already
138-
self.failUnlessRaises(OSError, os.close, fd)
138+
self.assertRaises(OSError, os.close, fd)
139139

140140
# read everything back, compare to data we zip
141141
fd = os.open(path, os.O_RDONLY | getattr(os, 'O_BINARY', 0))

gitdb/test/test_util.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def test_lockedfd(self):
4040
lockfilepath = lfd._lockfilepath()
4141

4242
# cannot end before it was started
43-
self.failUnlessRaises(AssertionError, lfd.rollback)
44-
self.failUnlessRaises(AssertionError, lfd.commit)
43+
self.assertRaises(AssertionError, lfd.rollback)
44+
self.assertRaises(AssertionError, lfd.commit)
4545

4646
# open for writing
4747
assert not os.path.isfile(lockfilepath)
@@ -77,7 +77,7 @@ def test_lockedfd(self):
7777
wfdstream = lfd.open(write=True, stream=True) # this time as stream
7878
assert os.path.isfile(lockfilepath)
7979
# another one fails
80-
self.failUnlessRaises(IOError, olfd.open)
80+
self.assertRaises(IOError, olfd.open)
8181

8282
wfdstream.write(new_data.encode("ascii"))
8383
lfd.commit()

0 commit comments

Comments
 (0)