Restore journaling and simplify tests.

Author: serhiy-storchaka

Lib/dbm/sqlite3.py

@@ -72,7 +72,7 @@ def __init__(self, path, /, *, flag, mode):
         # This is an optimization only; it's ok if it fails.
         if flag != "ro":
             with suppress(sqlite3.OperationalError):
-                self._cx.execute("PRAGMA journal_mode = OFF")
+                self._cx.execute("PRAGMA journal_mode = wal")
 
             if flag == "rwc":
                 self._execute(BUILD_TABLE)

Lib/test/test_dbm_sqlite3.py

@@ -91,86 +91,39 @@ def test_readonly_keys(self):
     def test_readonly_iter(self):
         self.assertEqual([k for k in self.db], [b"key1", b"key2"])
 
-class Immutable(unittest.TestCase):
-    def setUp(self):
-        self.filename = os_helper.TESTFN
-
-        db = dbm_sqlite3.open(self.filename, "c")
-        db[b"key"] = b"value"
-        db.close()
-
-        self.db = dbm_sqlite3.open(self.filename, "r")
-
-    def tearDown(self):
-        self.db.close()
-        for suffix in "", "-wal", "-shm":
-            os_helper.unlink(self.filename + suffix)
-
-    def test_readonly_open_without_wal_shm(self):
-        wal_path = self.filename + "-wal"
-        shm_path = self.filename + "-shm"
-
-        self.assertFalse(os.path.exists(wal_path))
-        self.assertFalse(os.path.exists(shm_path))
-
-        self.assertEqual(self.db[b"key"], b"value")
-
 
 class ReadOnlyFilesystem(unittest.TestCase):
 
     def setUp(self):
         self.test_dir = os_helper.TESTFN
+        self.addCleanup(os_helper.rmtree, self.test_dir)
         os.mkdir(self.test_dir)
         self.db_path = os.path.join(self.test_dir, "test.db")
 
         db = dbm_sqlite3.open(self.db_path, "c")
         db[b"key"] = b"value"
         db.close()
 
-    def tearDown(self):
-        os.chmod(self.db_path, stat.S_IWRITE)
-        os.chmod(self.test_dir, stat.S_IWRITE | stat.S_IEXEC | stat.S_IREAD)
-        os_helper.rmtree(self.test_dir)
-
-    def test_open_readonly_dir_success_ro(self):
-        files = os.listdir(self.test_dir)
-        self.assertEqual(sorted(files), ["test.db"])
-
-        os.chmod(self.test_dir, stat.S_IREAD | stat.S_IEXEC)
-        with dbm_sqlite3.open(self.db_path, "r") as db:
-            self.assertEqual(db[b"key"], b"value")
-
-    def test_open_readonly_file_success(self):
+    def test_readonly_file_read(self):
         os.chmod(self.db_path, stat.S_IREAD)
         with dbm_sqlite3.open(self.db_path, "r") as db:
             self.assertEqual(db[b"key"], b"value")
 
-    def test_open_readonly_file_fail_rw(self):
+    def test_readonly_file_write(self):
         os.chmod(self.db_path, stat.S_IREAD)
         with dbm_sqlite3.open(self.db_path, "w") as db:
-            with self.assertRaises(OSError):
+            with self.assertRaises(dbm_sqlite3.error):
                 db[b"newkey"] = b"newvalue"
-    @unittest.skipUnless(sys.platform == "darwin", "SQLite fallback behavior differs on non-macOS")
-    def test_open_readonly_dir_fail_rw_missing_wal_shm(self):
-        for suffix in ("-wal", "-shm"):
-            os_helper.unlink(self.db_path + suffix)
 
+    def test_readonly_dir_read(self):
         os.chmod(self.test_dir, stat.S_IREAD | stat.S_IEXEC)
+        with dbm_sqlite3.open(self.db_path, "r") as db:
+            self.assertEqual(db[b"key"], b"value")
 
-        with self.assertRaises(OSError):
-            with dbm_sqlite3.open(self.db_path, "w") as db:
-                db[b"newkey"] = b"newvalue"
-
-    @unittest.skipUnless(sys.platform == "darwin", "SQLite fallback behavior differs on non-macOS")
-    def test_open_readonly_dir_fail_rw_with_writable_db(self):
-        os.chmod(self.db_path, stat.S_IREAD | stat.S_IWRITE)
-        for suffix in ("-wal", "-shm"):
-            os_helper.unlink(self.db_path + suffix)
-
+    def test_readonly_dir_write(self):
         os.chmod(self.test_dir, stat.S_IREAD | stat.S_IEXEC)
-
-        with self.assertRaises(OSError):
-            with dbm_sqlite3.open(self.db_path, "w") as db:
+        with dbm_sqlite3.open(self.db_path, "w") as db:
+            with self.assertRaises(dbm_sqlite3.error):
                 db[b"newkey"] = b"newvalue"