Use assertEndsWith from test.support.testcase.ExtraAssertions

Author: tanloong

Lib/test/test_sqlite3/test_cli.py

@@ -4,10 +4,11 @@
 
 from sqlite3.__main__ import main as cli
 from test.support.os_helper import TESTFN, unlink
+from test.support.testcase import ExtraAssertions
 from test.support import captured_stdout, captured_stderr, captured_stdin
 
 
-class CommandLineInterface(unittest.TestCase):
+class CommandLineInterface(unittest.TestCase, ExtraAssertions):
 
     def _do_test(self, *args, expect_success=True):
         with (
@@ -88,22 +89,22 @@ def test_interact(self):
         out, err = self.run_cli()
         self.assertIn(self.MEMORY_DB_MSG, err)
         self.assertIn(self.MEMORY_DB_MSG, err)
-        self.assertTrue(out.endswith(self.PS1))
+        self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 1)
         self.assertEqual(out.count(self.PS2), 0)
 
     def test_interact_quit(self):
         out, err = self.run_cli(commands=(".quit",))
         self.assertIn(self.MEMORY_DB_MSG, err)
-        self.assertTrue(out.endswith(self.PS1))
+        self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 1)
         self.assertEqual(out.count(self.PS2), 0)
 
     def test_interact_version(self):
         out, err = self.run_cli(commands=(".version",))
         self.assertIn(self.MEMORY_DB_MSG, err)
         self.assertIn(sqlite3.sqlite_version + "\n", out)
-        self.assertTrue(out.endswith(self.PS1))
+        self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 2)
         self.assertEqual(out.count(self.PS2), 0)
         self.assertIn(sqlite3.sqlite_version, out)
@@ -144,14 +145,14 @@ def test_interact_valid_sql(self):
         out, err = self.run_cli(commands=("SELECT 1;",))
         self.assertIn(self.MEMORY_DB_MSG, err)
         self.assertIn("(1,)\n", out)
-        self.assertTrue(out.endswith(self.PS1))
+        self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 2)
         self.assertEqual(out.count(self.PS2), 0)
 
     def test_interact_incomplete_multiline_sql(self):
         out, err = self.run_cli(commands=("SELECT 1",))
         self.assertIn(self.MEMORY_DB_MSG, err)
-        self.assertTrue(out.endswith(self.PS2))
+        self.assertEndsWith(out, self.PS2)
         self.assertEqual(out.count(self.PS1), 1)
         self.assertEqual(out.count(self.PS2), 1)
 
@@ -160,15 +161,15 @@ def test_interact_valid_multiline_sql(self):
         self.assertIn(self.MEMORY_DB_MSG, err)
         self.assertIn(self.PS2, out)
         self.assertIn("(1,)\n", out)
-        self.assertTrue(out.endswith(self.PS1))
+        self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 2)
         self.assertEqual(out.count(self.PS2), 1)
 
     def test_interact_invalid_sql(self):
         out, err = self.run_cli(commands=("sel;",))
         self.assertIn(self.MEMORY_DB_MSG, err)
         self.assertIn("OperationalError (SQLITE_ERROR)", err)
-        self.assertTrue(out.endswith(self.PS1))
+        self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 2)
         self.assertEqual(out.count(self.PS2), 0)
 
@@ -177,7 +178,7 @@ def test_interact_on_disk_file(self):
 
         out, err = self.run_cli(TESTFN, commands=("CREATE TABLE t(t);",))
         self.assertIn(TESTFN, err)
-        self.assertTrue(out.endswith(self.PS1))
+        self.assertEndsWith(out, self.PS1)
 
         out, _ = self.run_cli(TESTFN, commands=("SELECT count(t) FROM t;",))
         self.assertIn("(0,)\n", out)