[3.9] bpo-25130: Make SQLite tests more compatible with PyPy (GH-28021) (GH-28023)

serhiy-storchaka · web-flow · commit dab74d68e3f8 · 2021-08-29T14:03:11.000+03:00
(cherry picked from commit 07d3d54)
diff --git a/Lib/sqlite3/test/backup.py b/Lib/sqlite3/test/backup.py
@@ -150,7 +150,8 @@ def test_database_source_name(self):
                 self.cx.backup(bck, name='non-existing')
         self.assertIn(
             str(cm.exception),
-            ['SQL logic error', 'SQL logic error or missing database']
+            ['SQL logic error', 'SQL logic error or missing database',
+             'unknown database non-existing']
         )
 
         self.cx.execute("ATTACH DATABASE ':memory:' AS attached_db")
diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
@@ -395,6 +395,9 @@ class MyIter:
             def __init__(self):
                 self.value = 5
 
+            def __iter__(self):
+                return self
+
             def __next__(self):
                 if self.value == 10:
                     raise StopIteration
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
@@ -127,11 +127,11 @@ def CheckTypeMapUsage(self):
         con = sqlite.connect(":memory:",detect_types=sqlite.PARSE_DECLTYPES)
         con.execute("create table foo(bar timestamp)")
         con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
-        con.execute(SELECT)
+        con.execute(SELECT).close()
         con.execute("drop table foo")
         con.execute("create table foo(bar integer)")
         con.execute("insert into foo(bar) values (5)")
-        con.execute(SELECT)
+        con.execute(SELECT).close()
 
     def CheckBindMutatingList(self):
         # Issue41662: Crash when mutate a list of parameters during iteration.

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ def test_database_source_name(self):`
`150`	`150`	`self.cx.backup(bck, name='non-existing')`
`151`	`151`	`self.assertIn(`
`152`	`152`	`str(cm.exception),`
`153`		`- ['SQL logic error', 'SQL logic error or missing database']`
	`153`	`+ ['SQL logic error', 'SQL logic error or missing database',`
	`154`	`+ 'unknown database non-existing']`
`154`	`155`	`)`
`155`	`156`
`156`	`157`	`self.cx.execute("ATTACH DATABASE ':memory:' AS attached_db")`