Replace assert_true with assertTrue

Also change TestOutputStream to subclass TestBase rather than object

5 files changed, 17 insertions, 22 deletions

diff --git a/git/test/lib/asserts.py b/git/test/lib/asserts.py
index 0e7592c0..207bbd68 100644
--- a/git/test/lib/asserts.py
+++ b/git/test/lib/asserts.py
@@ -7,8 +7,7 @@
 from unittest.mock import patch
 
 from nose.tools import (
-    assert_true,        # @UnusedImport
     assert_false        # @UnusedImport
 )
 
-__all__ = ['patch', 'assert_true', 'assert_false']
+__all__ = ['patch', 'assert_false']
diff --git a/git/test/test_diff.py b/git/test/test_diff.py
index fe41fc52..41907a91 100644
--- a/git/test/test_diff.py
+++ b/git/test/test_diff.py
@@ -20,7 +20,6 @@ from git.test.lib import (
     TestBase,
     StringProcessAdapter,
     fixture,
-    assert_true,
 )
 from git.test.lib import with_rw_directory
 
@@ -105,8 +104,8 @@ class TestDiff(TestBase):
         self.assertEqual(1, len(diffs))
 
         diff = diffs[0]
-        assert_true(diff.renamed_file)
-        assert_true(diff.renamed)
+        self.assertTrue(diff.renamed_file)
+        self.assertTrue(diff.renamed)
         self.assertEqual(diff.rename_from, u'Jérôme')
         self.assertEqual(diff.rename_to, u'müller')
         self.assertEqual(diff.raw_rename_from, b'J\xc3\xa9r\xc3\xb4me')
@@ -133,9 +132,9 @@ class TestDiff(TestBase):
         self.assertEqual(1, len(diffs))
 
         diff = diffs[0]
-        assert_true(diff.copied_file)
-        assert_true(diff.a_path, u'test1.txt')
-        assert_true(diff.b_path, u'test2.txt')
+        self.assertTrue(diff.copied_file)
+        self.assertTrue(diff.a_path, u'test1.txt')
+        self.assertTrue(diff.b_path, u'test2.txt')
         assert isinstance(str(diff), str)
 
         output = StringProcessAdapter(fixture('diff_copied_mode_raw'))
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 594e8fab..b0d1d8b6 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -19,7 +19,6 @@ from git.repo.fun import (
     find_worktree_git_dir
 )
 from git.test.lib import (
-    assert_true,
     TestBase,
     with_rw_repo,
     with_rw_directory
@@ -274,12 +273,12 @@ class TestFun(TestBase):
 
         dotgit = osp.join(worktree_path, ".git")
         statbuf = stat(dotgit)
-        assert_true(statbuf.st_mode & S_IFREG)
+        self.assertTrue(statbuf.st_mode & S_IFREG)
 
         gitdir = find_worktree_git_dir(dotgit)
         self.assertIsNotNone(gitdir)
         statbuf = stat(gitdir)
-        assert_true(statbuf.st_mode & S_IFDIR)
+        self.assertTrue(statbuf.st_mode & S_IFDIR)
 
     def test_tree_entries_from_data_with_failing_name_decode_py3(self):
         r = tree_entries_from_data(b'100644 \x9f\0aaa')
diff --git a/git/test/test_git.py b/git/test/test_git.py
index 69e8b0b4..75e35ab7 100644
--- a/git/test/test_git.py
+++ b/git/test/test_git.py
@@ -22,7 +22,6 @@ from git.compat import is_darwin
 from git.test.lib import (
     TestBase,
     patch,
-    assert_true,
     fixture_path
 )
 from git.test.lib import with_rw_directory
@@ -48,7 +47,7 @@ class TestGit(TestBase):
     def test_call_process_calls_execute(self, git):
         git.return_value = ''
         self.git.version()
-        assert_true(git.called)
+        self.assertTrue(git.called)
         self.assertEqual(git.call_args, ((['git', 'version'],), {}))
 
     def test_call_unpack_args_unicode(self):
@@ -95,7 +94,7 @@ class TestGit(TestBase):
     def test_it_ignores_false_kwargs(self, git):
         # this_should_not_be_ignored=False implies it *should* be ignored
         self.git.version(pass_this_kwarg=False)
-        assert_true("pass_this_kwarg" not in git.call_args[1])
+        self.assertTrue("pass_this_kwarg" not in git.call_args[1])
 
     def test_it_raises_proper_exception_with_output_stream(self):
         tmp_file = TemporaryFile()
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index a3fff4a8..fc836256 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -41,8 +41,7 @@ from git.test.lib import (
     TestBase,
     with_rw_repo,
     fixture,
-    assert_false,
-    assert_true
+    assert_false
 )
 from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath
 from git.test.lib import with_rw_directory
@@ -243,12 +242,12 @@ class TestRepo(TestBase):
 
     @with_rw_repo('HEAD')
     def test_max_chunk_size(self, repo):
-        class TestOutputStream(object):
+        class TestOutputStream(TestBase):
             def __init__(self, max_chunk_size):
                 self.max_chunk_size = max_chunk_size
 
             def write(self, b):
-                assert_true(len(b) <= self.max_chunk_size)
+                self.assertTrue(len(b) <= self.max_chunk_size)
 
         for chunk_size in [16, 128, 1024]:
             repo.git.status(output_stream=TestOutputStream(chunk_size), max_chunk_size=chunk_size)
@@ -404,7 +403,7 @@ class TestRepo(TestBase):
         # self.assertEqual(25, reduce(lambda acc, x: acc + len(x[-1]), b))
         self.assertEqual(hash(b[0][0]), hash(b[9][0]))
         c = b[0][0]
-        assert_true(git.called)
+        self.assertTrue(git.called)
 
         self.assertEqual('634396b2f541a9f2d58b00be1a07f0c358b999b3', c.hexsha)
         self.assertEqual('Tom Preston-Werner', c.author.name)
@@ -417,9 +416,9 @@ class TestRepo(TestBase):
 
         # test the 'lines per commit' entries
         tlist = b[0][1]
-        assert_true(tlist)
-        assert_true(isinstance(tlist[0], str))
-        assert_true(len(tlist) < sum(len(t) for t in tlist))               # test for single-char bug
+        self.assertTrue(tlist)
+        self.assertTrue(isinstance(tlist[0], str))
+        self.assertTrue(len(tlist) < sum(len(t) for t in tlist))               # test for single-char bug
 
         # BINARY BLAME
         git.return_value = fixture('blame_binary')