Skip to content

[2.7] Fixed several assertTrue() that were intended to be assertEqual(). (GH-8191) #8202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Jul 9, 2018
Merged

[2.7] Fixed several assertTrue() that were intended to be assertEqual(). (GH-8191) #8202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/ctypes/test/test_as_parameter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_wchar_parm(self):
f.argtypes = [c_byte, c_wchar, c_int, c_long, c_float, c_double]
result = f(self.wrap(1), self.wrap(u"x"), self.wrap(3), self.wrap(4), self.wrap(5.0), self.wrap(6.0))
self.assertEqual(result, 139)
self.assertTrue(type(result), int)
self.assertIs(type(result), int)

def test_pointers(self):
f = dll._testfunc_p_p
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def test_2(self):

s = """
from t2 import *
self.assertTrue(dir(), ['self', 'sub'])
self.assertEqual(dir(), ['self', 'sub'])
"""
self.run_code(s)

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_test_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def test_temp_cwd(self):
with support.temp_cwd(name=TESTFN):
self.assertEqual(os.path.basename(os.getcwd()), TESTFN)
self.assertFalse(os.path.exists(TESTFN))
self.assertTrue(os.path.basename(os.getcwd()), here)
self.assertEqual(os.getcwd(), here)


def test_temp_cwd__name_none(self):
Expand Down
12 changes: 8 additions & 4 deletions Lib/test/test_warnings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,14 @@ def test_always(self):
self.module.resetwarnings()
self.module.filterwarnings("always", category=UserWarning)
message = "FilterTests.test_always"
self.module.warn(message, UserWarning)
self.assertTrue(message, w[-1].message)
self.module.warn(message, UserWarning)
self.assertTrue(w[-1].message, message)
def f():
self.module.warn(message, UserWarning)
f()
self.assertEqual(len(w), 1)
self.assertEqual(w[-1].message.args[0], message)
f()
self.assertEqual(len(w), 2)
self.assertEqual(w[-1].message.args[0], message)

def test_default(self):
with original_warnings.catch_warnings(record=True,
Expand Down