diff options
| -rw-r--r-- | coverage/sqldata.py | 38 | ||||
| -rw-r--r-- | tests/coveragetest.py | 6 | ||||
| -rw-r--r-- | tests/test_data.py | 42 | ||||
| -rw-r--r-- | tests/test_process.py | 4 |
4 files changed, 55 insertions, 35 deletions
diff --git a/coverage/sqldata.py b/coverage/sqldata.py index f92e245b..0037d76d 100644 --- a/coverage/sqldata.py +++ b/coverage/sqldata.py @@ -4,10 +4,8 @@ """Sqlite coverage data.""" # TODO: get sys_info for data class, so we can see sqlite version etc -# TODO: get rid of skip_unless_data_storage_is_json +# TODO: get rid of skip_unless_data_storage_is # TODO: get rid of "JSON message" and "SQL message" in the tests -# TODO: check the schema -# TODO: get rid of the application_id? # TODO: factor out dataop debugging to a wrapper class? # TODO: make sure all dataop debugging is in place somehow # TODO: should writes be batched? @@ -17,7 +15,6 @@ import glob import os import sqlite3 -import struct from coverage.backward import iitems from coverage.data import filename_suffix @@ -26,13 +23,13 @@ from coverage.files import PathAliases from coverage.misc import CoverageException, file_be_gone +SCHEMA_VERSION = 1 + SCHEMA = """ -create table schema ( +create table coverage_schema ( version integer ); -insert into schema (version) values (1); - create table meta ( has_lines boolean, has_arcs boolean @@ -63,13 +60,6 @@ create table tracer ( ); """ -APP_ID = 0xc07e8a6e # "coverage", kind of. - -def unsigned_to_signed(val): - return struct.unpack('>i', struct.pack('>I', val))[0] - -def signed_to_unsigned(val): - return struct.unpack('>I', struct.pack('>i', val))[0] class CoverageSqliteData(SimpleRepr): def __init__(self, basename=None, suffix=None, warn=None, debug=None): @@ -100,11 +90,11 @@ class CoverageSqliteData(SimpleRepr): self._debug.write("Creating data file {!r}".format(self.filename)) self._db = Sqlite(self.filename, self._debug) with self._db: - self._db.execute("pragma application_id = {}".format(unsigned_to_signed(APP_ID))) for stmt in SCHEMA.split(';'): stmt = stmt.strip() if stmt: self._db.execute(stmt) + self._db.execute("insert into coverage_schema (version) values (?)", (SCHEMA_VERSION,)) self._db.execute( "insert into meta (has_lines, has_arcs) values (?, ?)", (self._has_lines, self._has_arcs) @@ -115,12 +105,20 @@ class CoverageSqliteData(SimpleRepr): self._debug.write("Opening data file {!r}".format(self.filename)) self._db = Sqlite(self.filename, self._debug) with self._db: - for app_id, in self._db.execute("pragma application_id"): - app_id = signed_to_unsigned(int(app_id)) - if app_id != APP_ID: + try: + schema_version, = self._db.execute("select version from coverage_schema").fetchone() + except Exception as exc: + raise CoverageException( + "Data file {!r} doesn't seem to be a coverage data file: {}".format( + self.filename, exc + ) + ) + else: + if schema_version != SCHEMA_VERSION: raise CoverageException( - "Couldn't use {!r}: wrong application_id: " - "0x{:08x} != 0x{:08x}".format(self.filename, app_id, APP_ID) + "Couldn't use data file {!r}: wrong schema: {} instead of {}".format( + self.filename, schema_version, SCHEMA_VERSION + ) ) for row in self._db.execute("select has_lines, has_arcs from meta"): self._has_lines, self._has_arcs = row diff --git a/tests/coveragetest.py b/tests/coveragetest.py index 6e308718..15c61ece 100644 --- a/tests/coveragetest.py +++ b/tests/coveragetest.py @@ -97,9 +97,9 @@ class CoverageTest( self.last_command_output = None self.last_module_name = None - def skip_unless_data_storage_is_json(self): - if STORAGE != "json": - self.skipTest("Not using JSON for data storage") + def skip_unless_data_storage_is(self, storage): + if STORAGE != storage: + self.skipTest("Not using {} for data storage".format(storage)) def clean_local_file_imports(self): """Clean up the results of calls to `import_local_file`. diff --git a/tests/test_data.py b/tests/test_data.py index 1e6ce027..15da32e5 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -8,6 +8,7 @@ import json import os import os.path import re +import sqlite3 import mock @@ -190,7 +191,7 @@ class CoverageDataTest(DataTestHelpers, CoverageTest): self.assertIsNone(covdata.lines('no_such_file.py')) def test_run_info(self): - self.skip_unless_data_storage_is_json() + self.skip_unless_data_storage_is("json") covdata = CoverageData() self.assertEqual(covdata.run_infos(), []) covdata.add_run_info(hello="there") @@ -269,7 +270,7 @@ class CoverageDataTest(DataTestHelpers, CoverageTest): self.assertEqual(covdata3.run_infos(), []) def test_update_run_info(self): - self.skip_unless_data_storage_is_json() + self.skip_unless_data_storage_is("json") covdata1 = CoverageData() covdata1.add_arcs(ARCS_3) covdata1.add_run_info(hello="there", count=17) @@ -475,15 +476,36 @@ class CoverageDataTestInTempDir(DataTestHelpers, CoverageTest): covdata.read() self.assertFalse(covdata) - if STORAGE == "json": - self.make_file("misleading.dat", CoverageData._GO_AWAY + " this isn't JSON") - with self.assertRaisesRegex(CoverageException, msg.format("misleading.dat")): - covdata = CoverageData("misleading.dat") - covdata.read() - self.assertFalse(covdata) + def test_read_json_errors(self): + self.skip_unless_data_storage_is("json") + self.make_file("misleading.dat", CoverageData._GO_AWAY + " this isn't JSON") + msg = r"Couldn't .* '.*[/\\]{0}': \S+" + with self.assertRaisesRegex(CoverageException, msg.format("misleading.dat")): + covdata = CoverageData("misleading.dat") + covdata.read() + self.assertFalse(covdata) + + def test_read_sql_errors(self): + self.skip_unless_data_storage_is("sql") + with sqlite3.connect("wrong_schema.db") as con: + con.execute("create table coverage_schema (version integer)") + con.execute("insert into coverage_schema (version) values (99)") + msg = r"Couldn't .* '.*[/\\]{0}': wrong schema: 99 instead of \d+".format("wrong_schema.db") + with self.assertRaisesRegex(CoverageException, msg): + covdata = CoverageData("wrong_schema.db") + covdata.read() + self.assertFalse(covdata) + + with sqlite3.connect("no_schema.db") as con: + con.execute("create table foobar (baz text)") + msg = r"Couldn't .* '.*[/\\]{0}': \S+".format("no_schema.db") + with self.assertRaisesRegex(CoverageException, msg): + covdata = CoverageData("no_schema.db") + covdata.read() + self.assertFalse(covdata) def test_debug_main(self): - self.skip_unless_data_storage_is_json() + self.skip_unless_data_storage_is("json") covdata1 = CoverageData(".coverage") covdata1.add_lines(LINES_1) covdata1.write() @@ -660,7 +682,7 @@ class CoverageDataFilesTest(DataTestHelpers, CoverageTest): def read_json_data_file(self, fname): """Read a JSON data file for testing the JSON directly.""" - self.skip_unless_data_storage_is_json() + self.skip_unless_data_storage_is("json") with open(fname, 'r') as fdata: go_away = fdata.read(len(CoverageData._GO_AWAY)) self.assertEqual(go_away, CoverageData._GO_AWAY) diff --git a/tests/test_process.py b/tests/test_process.py index 49919b0f..1ac18ffe 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -516,7 +516,7 @@ class ProcessTest(CoverageTest): if not hasattr(os, 'fork'): self.skipTest("Can't test os.fork since it doesn't exist.") # See https://nedbatchelder.com/blog/201808/sqlite_data_storage_for_coveragepy.html - self.skip_unless_data_storage_is_json() + self.skip_unless_data_storage_is("json") self.make_file("fork.py", """\ import os @@ -655,7 +655,7 @@ class ProcessTest(CoverageTest): if env.PYPY and env.PY3 and env.PYPYVERSION[:3] == (5, 10, 0): # pragma: obscure # https://bitbucket.org/pypy/pypy/issues/2729/pypy3-510-incorrectly-decodes-astral-plane self.skipTest("Avoid incorrect decoding astral plane JSON chars") - self.skip_unless_data_storage_is_json() + self.skip_unless_data_storage_is("json") self.make_file(".coveragerc", """\ [run] |