Skip to content

Commit 7fd8768

Browse files
Harmon758Harmon758
committed
Replace assert_true with assertTrue
Also change TestOutputStream to subclass TestBase rather than object
1 parent eca6951 commit 7fd8768

File tree

5 files changed

+17
-22
lines changed

5 files changed

+17
-22
lines changed

‎git/test/lib/asserts.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
from unittest.mock import patch
88

99
from nose.tools import (
10-
assert_true, # @UnusedImport
1110
assert_false # @UnusedImport
1211
)
1312

14-
__all__ = ['patch', 'assert_true', 'assert_false']
13+
__all__ = ['patch', 'assert_false']

‎git/test/test_diff.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
TestBase,
2121
StringProcessAdapter,
2222
fixture,
23-
assert_true,
2423
)
2524
from git.test.lib import with_rw_directory
2625

@@ -105,8 +104,8 @@ def test_diff_with_rename(self):
105104
self.assertEqual(1, len(diffs))
106105

107106
diff = diffs[0]
108-
assert_true(diff.renamed_file)
109-
assert_true(diff.renamed)
107+
self.assertTrue(diff.renamed_file)
108+
self.assertTrue(diff.renamed)
110109
self.assertEqual(diff.rename_from, u'Jérôme')
111110
self.assertEqual(diff.rename_to, u'müller')
112111
self.assertEqual(diff.raw_rename_from, b'J\xc3\xa9r\xc3\xb4me')
@@ -133,9 +132,9 @@ def test_diff_with_copied_file(self):
133132
self.assertEqual(1, len(diffs))
134133

135134
diff = diffs[0]
136-
assert_true(diff.copied_file)
137-
assert_true(diff.a_path, u'test1.txt')
138-
assert_true(diff.b_path, u'test2.txt')
135+
self.assertTrue(diff.copied_file)
136+
self.assertTrue(diff.a_path, u'test1.txt')
137+
self.assertTrue(diff.b_path, u'test2.txt')
139138
assert isinstance(str(diff), str)
140139

141140
output = StringProcessAdapter(fixture('diff_copied_mode_raw'))

‎git/test/test_fun.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
find_worktree_git_dir
2020
)
2121
from git.test.lib import (
22-
assert_true,
2322
TestBase,
2423
with_rw_repo,
2524
with_rw_directory
@@ -274,12 +273,12 @@ def test_linked_worktree_traversal(self, rw_dir):
274273

275274
dotgit = osp.join(worktree_path, ".git")
276275
statbuf = stat(dotgit)
277-
assert_true(statbuf.st_mode & S_IFREG)
276+
self.assertTrue(statbuf.st_mode & S_IFREG)
278277

279278
gitdir = find_worktree_git_dir(dotgit)
280279
self.assertIsNotNone(gitdir)
281280
statbuf = stat(gitdir)
282-
assert_true(statbuf.st_mode & S_IFDIR)
281+
self.assertTrue(statbuf.st_mode & S_IFDIR)
283282

284283
def test_tree_entries_from_data_with_failing_name_decode_py3(self):
285284
r = tree_entries_from_data(b'100644 \x9f\0aaa')

‎git/test/test_git.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from git.test.lib import (
2323
TestBase,
2424
patch,
25-
assert_true,
2625
fixture_path
2726
)
2827
from git.test.lib import with_rw_directory
@@ -48,7 +47,7 @@ def tearDown(self):
4847
def test_call_process_calls_execute(self, git):
4948
git.return_value = ''
5049
self.git.version()
51-
assert_true(git.called)
50+
self.assertTrue(git.called)
5251
self.assertEqual(git.call_args, ((['git', 'version'],), {}))
5352

5453
def test_call_unpack_args_unicode(self):
@@ -95,7 +94,7 @@ def test_it_accepts_stdin(self):
9594
def test_it_ignores_false_kwargs(self, git):
9695
# this_should_not_be_ignored=False implies it *should* be ignored
9796
self.git.version(pass_this_kwarg=False)
98-
assert_true("pass_this_kwarg" not in git.call_args[1])
97+
self.assertTrue("pass_this_kwarg" not in git.call_args[1])
9998

10099
def test_it_raises_proper_exception_with_output_stream(self):
101100
tmp_file = TemporaryFile()

‎git/test/test_repo.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
TestBase,
4242
with_rw_repo,
4343
fixture,
44-
assert_false,
45-
assert_true
44+
assert_false
4645
)
4746
from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath
4847
from git.test.lib import with_rw_directory
@@ -243,12 +242,12 @@ def test_clone_from_with_path_contains_unicode(self):
243242

244243
@with_rw_repo('HEAD')
245244
def test_max_chunk_size(self, repo):
246-
class TestOutputStream(object):
245+
class TestOutputStream(TestBase):
247246
def __init__(self, max_chunk_size):
248247
self.max_chunk_size = max_chunk_size
249248

250249
def write(self, b):
251-
assert_true(len(b) <= self.max_chunk_size)
250+
self.assertTrue(len(b) <= self.max_chunk_size)
252251

253252
for chunk_size in [16, 128, 1024]:
254253
repo.git.status(output_stream=TestOutputStream(chunk_size), max_chunk_size=chunk_size)
@@ -404,7 +403,7 @@ def test_should_display_blame_information(self, git):
404403
# self.assertEqual(25, reduce(lambda acc, x: acc + len(x[-1]), b))
405404
self.assertEqual(hash(b[0][0]), hash(b[9][0]))
406405
c = b[0][0]
407-
assert_true(git.called)
406+
self.assertTrue(git.called)
408407

409408
self.assertEqual('634396b2f541a9f2d58b00be1a07f0c358b999b3', c.hexsha)
410409
self.assertEqual('Tom Preston-Werner', c.author.name)
@@ -417,9 +416,9 @@ def test_should_display_blame_information(self, git):
417416

418417
# test the 'lines per commit' entries
419418
tlist = b[0][1]
420-
assert_true(tlist)
421-
assert_true(isinstance(tlist[0], str))
422-
assert_true(len(tlist) < sum(len(t) for t in tlist)) # test for single-char bug
419+
self.assertTrue(tlist)
420+
self.assertTrue(isinstance(tlist[0], str))
421+
self.assertTrue(len(tlist) < sum(len(t) for t in tlist)) # test for single-char bug
423422

424423
# BINARY BLAME
425424
git.return_value = fixture('blame_binary')

0 commit comments

Comments
 (0)