commit b796e7dcdc24ff7ec53044af041254c83a8ace21
author Sergey Fedoseev <fedoseev.sergey@gmail.com> Mon Jul 09 20:25:55 2018 +0500
committer Serhiy Storchaka <storchaka@gmail.com> Mon Jul 09 18:25:55 2018 +0300
tree e2addc7ce512047e9ce01054e0587951acc8802a
parent c287545d62edf1a1ee65727d3c57befa8c99c13a

Fixed several assertTrue() that were intended to be assertEqual(). (GH-8191)

Fixed also testing the "always" warning filter.

Lib/test/test_pkg.py

diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py
index 532e8fe..8130eab 100644
--- a/Lib/test/test_pkg.py
+++ b/Lib/test/test_pkg.py
@@ -138,7 +138,7 @@
 
         s = """
             from t2 import *
-            self.assertTrue(dir(), ['self', 'sub'])
+            self.assertEqual(dir(), ['self', 'sub'])
             """
         self.run_code(s)
 

Lib/test/test_socket.py

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index f377ebc..4f3c477 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5843,7 +5843,7 @@
                                  op=socket.ALG_OP_ENCRYPT, iv=iv)
                 enc = op.recv(msglen * multiplier)
             self.assertEqual(len(enc), msglen * multiplier)
-            self.assertTrue(enc[:msglen], ciphertext)
+            self.assertEqual(enc[:msglen], ciphertext)
 
             op, _ = algo.accept()
             with op:

Lib/test/test_support.py

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 89f1fbf..7870e94 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -264,7 +264,7 @@
         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):

Lib/test/test_tokenize.py

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index f68580c..ff14479 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1360,7 +1360,7 @@
             tokenize_module.detect_encoding = orig_detect_encoding
             tokenize_module._tokenize = orig__tokenize
 
-        self.assertTrue(encoding_used, encoding)
+        self.assertEqual(encoding_used, encoding)
 
     def test_oneline_defs(self):
         buf = []

Lib/test/test_warnings/__init__.py

diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py
index 87f929f..a4775d0 100644
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -148,10 +148,14 @@
             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_always_after_default(self):
         with original_warnings.catch_warnings(record=True,