summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo van Kemenade <hugovk@users.noreply.github.com>2021-08-19 12:09:11 +0300
committerSebastian Thiel <sebastian.thiel@icloud.com>2021-08-19 18:37:43 +0800
commitdff15cd8ba473776f76e8a3b6359a861e72d74aa (patch)
treecc2109576ed78d4f0da7257c5e5063540d303a85
parent03ab3a1d40c04d6a944299c21db61cf9ce30f6bb (diff)
downloadgitdb-dff15cd8ba473776f76e8a3b6359a861e72d74aa.tar.gz
Replace deprecated unittest aliases
-rw-r--r--gitdb/test/db/lib.py4
-rw-r--r--gitdb/test/db/test_git.py2
-rw-r--r--gitdb/test/db/test_loose.py2
-rw-r--r--gitdb/test/db/test_pack.py2
-rw-r--r--gitdb/test/test_pack.py2
-rw-r--r--gitdb/test/test_stream.py2
-rw-r--r--gitdb/test/test_util.py6
7 files changed, 10 insertions, 10 deletions
diff --git a/gitdb/test/db/lib.py b/gitdb/test/db/lib.py
index c6f4316..3df326b 100644
--- a/gitdb/test/db/lib.py
+++ b/gitdb/test/db/lib.py
@@ -102,8 +102,8 @@ class TestDBBase(TestBase):
assert ostream.type == str_blob_type
assert ostream.size == len(data)
else:
- self.failUnlessRaises(BadObject, db.info, sha)
- self.failUnlessRaises(BadObject, db.stream, sha)
+ self.assertRaises(BadObject, db.info, sha)
+ self.assertRaises(BadObject, db.stream, sha)
# DIRECT STREAM COPY
# our data hase been written in object format to the StringIO
diff --git a/gitdb/test/db/test_git.py b/gitdb/test/db/test_git.py
index acc0f15..6ecf7d7 100644
--- a/gitdb/test/db/test_git.py
+++ b/gitdb/test/db/test_git.py
@@ -43,7 +43,7 @@ class TestGitDB(TestDBBase):
assert gdb.partial_to_complete_sha_hex(bin_to_hex(binsha)[:8 - (i % 2)]) == binsha
# END for each sha
- self.failUnlessRaises(BadObject, gdb.partial_to_complete_sha_hex, "0000")
+ self.assertRaises(BadObject, gdb.partial_to_complete_sha_hex, "0000")
@with_rw_directory
def test_writing(self, path):
diff --git a/gitdb/test/db/test_loose.py b/gitdb/test/db/test_loose.py
index 9c25a02..8cc660b 100644
--- a/gitdb/test/db/test_loose.py
+++ b/gitdb/test/db/test_loose.py
@@ -32,5 +32,5 @@ class TestLooseDB(TestDBBase):
assert bin_to_hex(ldb.partial_to_complete_sha_hex(short_sha)) == long_sha
# END for each sha
- self.failUnlessRaises(BadObject, ldb.partial_to_complete_sha_hex, '0000')
+ self.assertRaises(BadObject, ldb.partial_to_complete_sha_hex, '0000')
# raises if no object could be found
diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
index 9694238..458d804 100644
--- a/gitdb/test/db/test_pack.py
+++ b/gitdb/test/db/test_pack.py
@@ -84,4 +84,4 @@ class TestPackDB(TestDBBase):
# assert num_ambiguous
# non-existing
- self.failUnlessRaises(BadObject, pdb.partial_to_complete_sha, b'\0\0', 4)
+ self.assertRaises(BadObject, pdb.partial_to_complete_sha, b'\0\0', 4)
diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
index 8bf78f0..48a1852 100644
--- a/gitdb/test/test_pack.py
+++ b/gitdb/test/test_pack.py
@@ -73,7 +73,7 @@ class TestPack(TestBase):
assert index.partial_sha_to_index(sha[:l], l * 2) == oidx
# END for each object index in indexfile
- self.failUnlessRaises(ValueError, index.partial_sha_to_index, "\0", 2)
+ self.assertRaises(ValueError, index.partial_sha_to_index, "\0", 2)
def _assert_pack_file(self, pack, version, size):
assert pack.version() == 2
diff --git a/gitdb/test/test_stream.py b/gitdb/test/test_stream.py
index 9626825..5d4b93d 100644
--- a/gitdb/test/test_stream.py
+++ b/gitdb/test/test_stream.py
@@ -135,7 +135,7 @@ class TestStream(TestBase):
ostream.close()
# its closed already
- self.failUnlessRaises(OSError, os.close, fd)
+ self.assertRaises(OSError, os.close, fd)
# read everything back, compare to data we zip
fd = os.open(path, os.O_RDONLY | getattr(os, 'O_BINARY', 0))
diff --git a/gitdb/test/test_util.py b/gitdb/test/test_util.py
index 847bdab..3b3165d 100644
--- a/gitdb/test/test_util.py
+++ b/gitdb/test/test_util.py
@@ -40,8 +40,8 @@ class TestUtils(TestBase):
lockfilepath = lfd._lockfilepath()
# cannot end before it was started
- self.failUnlessRaises(AssertionError, lfd.rollback)
- self.failUnlessRaises(AssertionError, lfd.commit)
+ self.assertRaises(AssertionError, lfd.rollback)
+ self.assertRaises(AssertionError, lfd.commit)
# open for writing
assert not os.path.isfile(lockfilepath)
@@ -77,7 +77,7 @@ class TestUtils(TestBase):
wfdstream = lfd.open(write=True, stream=True) # this time as stream
assert os.path.isfile(lockfilepath)
# another one fails
- self.failUnlessRaises(IOError, olfd.open)
+ self.assertRaises(IOError, olfd.open)
wfdstream.write(new_data.encode("ascii"))
lfd.commit()