Skip to content

Commit e36bbde

Browse files
moreatimoreati
committed
tests: Replace uses of assertTrue() with specific methods
1 parent eb4a7e0 commit e36bbde

25 files changed

+116
-120
lines changed

‎tests/ansible/tests/env_file_watcher_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_key_deleted(self):
4242
self.tf.seek(0)
4343
self.tf.truncate(0)
4444
watcher.check()
45-
self.assertTrue(b('SOMEKEY') not in environb)
45+
self.assertNotIn(b('SOMEKEY'), environb)
4646

4747
def test_key_added(self):
4848
watcher = klass(self.tf.name)

‎tests/call_error_test.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ class ConstructorTest(testlib.TestCase):
1313
def test_string_noargs(self):
1414
e = self.klass('%s%s')
1515
self.assertEqual(e.args[0], '%s%s')
16-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
16+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
1717

1818
def test_string_args(self):
1919
e = self.klass('%s%s', 1, 1)
2020
self.assertEqual(e.args[0], '11')
21-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
21+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
2222

2323
def test_from_exc(self):
2424
ve = plain_old_module.MyError('eek')
2525
e = self.klass(ve)
2626
self.assertEqual(e.args[0], 'plain_old_module.MyError: eek')
27-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
27+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
2828

2929
def test_form_base_exc(self):
3030
ve = SystemExit('eek')
@@ -33,7 +33,7 @@ def test_form_base_exc(self):
3333
self.assertEqual(e.args[0],
3434
# varies across 2/3.
3535
'%s.%s: eek' % (cls.__module__, cls.__name__))
36-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
36+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
3737

3838
def test_from_exc_tb(self):
3939
try:
@@ -43,18 +43,18 @@ def test_from_exc_tb(self):
4343
e = self.klass(ve)
4444

4545
self.assertTrue(e.args[0].startswith('plain_old_module.MyError: eek'))
46-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
47-
self.assertTrue('test_from_exc_tb' in e.args[0])
46+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
47+
self.assertIn('test_from_exc_tb', e.args[0])
4848

4949
def test_bytestring_conversion(self):
5050
e = self.klass(mitogen.core.b('bytes'))
5151
self.assertEqual(u'bytes', e.args[0])
52-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
52+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
5353

5454
def test_reduce(self):
5555
e = self.klass('eek')
5656
func, (arg,) = e.__reduce__()
57-
self.assertTrue(func is mitogen.core._unpickle_call_error)
57+
self.assertIs(func, mitogen.core._unpickle_call_error)
5858
self.assertEqual(arg, e.args[0])
5959

6060

@@ -105,4 +105,4 @@ def test_from_exc_tb(self):
105105

106106
e2 = pickle.loads(pickle.dumps(e))
107107
self.assertTrue(e2.args[0].startswith('plain_old_module.MyError: eek'))
108-
self.assertTrue('test_from_exc_tb' in e2.args[0])
108+
self.assertIn('test_from_exc_tb', e2.args[0])

‎tests/connection_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def thread():
3939
th.join()
4040

4141
exc, = result
42-
self.assertTrue(isinstance(exc, mitogen.parent.CancelledError))
42+
self.assertIsInstance(exc, mitogen.parent.CancelledError)
4343
self.assertEqual(mitogen.parent.BROKER_SHUTDOWN_MSG, exc.args[0])
4444

4545

‎tests/create_child_test.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@ def test_stdin(self):
207207
self.assertTrue(stat.S_ISCHR(st.st_mode))
208208
self.assertTrue(stat.S_ISCHR(info['st_mode']))
209209

210-
self.assertTrue(isinstance(info['ttyname'],
211-
mitogen.core.UnicodeType))
210+
self.assertIsInstance(info['ttyname'], mitogen.core.UnicodeType)
212211
self.assertTrue(os.isatty(proc.stdin.fileno()))
213212

214213
flags = fcntl.fcntl(proc.stdin.fileno(), fcntl.F_GETFL)
@@ -225,8 +224,7 @@ def test_stdout(self):
225224
self.assertTrue(stat.S_ISCHR(st.st_mode))
226225
self.assertTrue(stat.S_ISCHR(info['st_mode']))
227226

228-
self.assertTrue(isinstance(info['ttyname'],
229-
mitogen.core.UnicodeType))
227+
self.assertIsInstance(info['ttyname'], mitogen.core.UnicodeType)
230228
self.assertTrue(os.isatty(proc.stdout.fileno()))
231229

232230
flags = fcntl.fcntl(proc.stdout.fileno(), fcntl.F_GETFL)
@@ -247,8 +245,7 @@ def test_stderr(self):
247245
self.assertTrue(stat.S_ISCHR(st.st_mode))
248246
self.assertTrue(stat.S_ISCHR(info['st_mode']))
249247

250-
self.assertTrue(isinstance(info['ttyname'],
251-
mitogen.core.UnicodeType))
248+
self.assertIsInstance(info['ttyname'], mitogen.core.UnicodeType)
252249
self.assertTrue(os.isatty(proc.stdout.fileno()))
253250

254251
flags = fcntl.fcntl(proc.stdout.fileno(), fcntl.F_GETFL)
@@ -295,8 +292,7 @@ def test_stderr(self):
295292
self.assertTrue(stat.S_ISCHR(st.st_mode))
296293
self.assertTrue(stat.S_ISCHR(info['st_mode']))
297294

298-
self.assertTrue(isinstance(info['ttyname'],
299-
mitogen.core.UnicodeType))
295+
self.assertIsInstance(info['ttyname'], mitogen.core.UnicodeType)
300296
self.assertTrue(os.isatty(proc.stderr.fileno()))
301297

302298
flags = fcntl.fcntl(proc.stderr.fileno(), fcntl.F_GETFL)

‎tests/doas_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_okay(self):
3737
# e = self.assertRaises(mitogen.core.StreamError,
3838
# lambda: self.router.doas(via=ssh)
3939
# )
40-
# self.assertTrue(mitogen.doas.password_required_msg in str(e))
40+
# self.assertIn(mitogen.doas.password_required_msg, str(e))
4141

4242
# def test_password_incorrect(self):
4343
# ssh = self.docker_ssh(
@@ -47,7 +47,7 @@ def test_okay(self):
4747
# e = self.assertRaises(mitogen.core.StreamError,
4848
# lambda: self.router.doas(via=ssh, password='x')
4949
# )
50-
# self.assertTrue(mitogen.doas.password_incorrect_msg in str(e))
50+
# self.assertIn(mitogen.doas.password_incorrect_msg, str(e))
5151

5252
# def test_password_okay(self):
5353
# ssh = self.docker_ssh(

‎tests/error_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ class ConstructorTest(testlib.TestCase):
88
def test_literal_no_format(self):
99
e = self.klass('error')
1010
self.assertEqual(e.args[0], 'error')
11-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
11+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
1212

1313
def test_literal_format_chars_present(self):
1414
e = self.klass('error%s')
1515
self.assertEqual(e.args[0], 'error%s')
16-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
16+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
1717

1818
def test_format(self):
1919
e = self.klass('error%s', 123)
2020
self.assertEqual(e.args[0], 'error123')
21-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
21+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)
2222

2323
def test_bytes_to_unicode(self):
2424
e = self.klass(mitogen.core.b('error'))
2525
self.assertEqual(e.args[0], 'error')
26-
self.assertTrue(isinstance(e.args[0], mitogen.core.UnicodeType))
26+
self.assertIsInstance(e.args[0], mitogen.core.UnicodeType)

‎tests/file_service_test.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ def test_unauthorized(self):
4040
pool.stop()
4141

4242
expect = service.unregistered_msg % ('/etc/shadow',)
43-
self.assertTrue(expect in e.args[0])
43+
self.assertIn(expect, e.args[0])
4444

4545
if sys.platform == 'darwin':
4646
ROOT_GROUP = 'wheel'
4747
else:
4848
ROOT_GROUP = 'root'
4949

5050
def _validate_response(self, resp):
51-
self.assertTrue(isinstance(resp, dict))
51+
self.assertIsInstance(resp, dict)
5252
self.assertEqual('root', resp['owner'])
5353
self.assertEqual(self.ROOT_GROUP, resp['group'])
54-
self.assertTrue(isinstance(resp['mode'], int))
55-
self.assertTrue(isinstance(resp['mtime'], float))
56-
self.assertTrue(isinstance(resp['atime'], float))
57-
self.assertTrue(isinstance(resp['size'], int))
54+
self.assertIsInstance(resp['mode'], int)
55+
self.assertIsInstance(resp['mtime'], float)
56+
self.assertIsInstance(resp['atime'], float)
57+
self.assertIsInstance(resp['size'], int)
5858

5959
def test_path_authorized(self):
6060
recv = mitogen.core.Receiver(self.router)
@@ -117,7 +117,7 @@ def test_prefix_authorized_abspath_bad(self):
117117
pool.stop()
118118

119119
expect = service.unregistered_msg % (path,)
120-
self.assertTrue(expect in e.args[0])
120+
self.assertIn(expect, e.args[0])
121121

122122
def test_prefix_authorized_abspath_good(self):
123123
l1 = self.router.local()
@@ -144,4 +144,4 @@ def test_prefix_authorized_abspath_good(self):
144144
pool.stop()
145145

146146
expect = service.unregistered_msg % (path,)
147-
self.assertTrue(expect in e.args[0])
147+
self.assertIn(expect, e.args[0])

‎tests/latch_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def test_one_thread(self):
198198
self.join()
199199
self.assertEqual(self.results, [None])
200200
for exc in self.excs:
201-
self.assertTrue(isinstance(exc, mitogen.core.LatchError))
201+
self.assertIsInstance(exc, mitogen.core.LatchError)
202202

203203
def test_five_threads(self):
204204
latch = self.klass()
@@ -208,4 +208,4 @@ def test_five_threads(self):
208208
self.join()
209209
self.assertEqual(self.results, [None]*5)
210210
for exc in self.excs:
211-
self.assertTrue(isinstance(exc, mitogen.core.LatchError))
211+
self.assertIsInstance(exc, mitogen.core.LatchError)

‎tests/log_handler_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ def test_earliest_messages_logged(self):
6565
c1.shutdown(wait=True)
6666

6767
logs = log.stop()
68-
self.assertTrue('Python version is' in logs)
69-
self.assertTrue('Parent is context 0 (master)' in logs)
68+
self.assertIn('Python version is', logs)
69+
self.assertIn('Parent is context 0 (master)', logs)
7070

7171
def test_earliest_messages_logged_via(self):
7272
c1 = self.router.local(name='c1')
@@ -80,10 +80,10 @@ def test_earliest_messages_logged_via(self):
8080
c2.shutdown(wait=True)
8181

8282
logs = log.stop()
83-
self.assertTrue('Python version is' in logs)
83+
self.assertIn('Python version is', logs)
8484

8585
expect = 'Parent is context %s (%s)' % (c1.context_id, 'parent')
86-
self.assertTrue(expect in logs)
86+
self.assertIn(expect, logs)
8787

8888
StartupTest = unittest.skipIf(
8989
condition=sys.version_info < (2, 7) or sys.version_info >= (3, 6),

‎tests/lxc_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_okay(self):
2626

2727
argv = eval(context.call(os.getenv, 'ORIGINAL_ARGV'))
2828
self.assertEqual(argv[0], self.lxc_attach_path)
29-
self.assertTrue('--clear-env' in argv)
29+
self.assertIn('--clear-env', argv)
3030
self.assertTrue(has_subseq(argv, ['--name', 'container_name']))
3131

3232
def test_eof(self):

0 commit comments

Comments
 (0)