diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/data.py | 2 | ||||
| -rw-r--r-- | coverage/sqldata.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/coverage/data.py b/coverage/data.py index 16fb9a8a..baddaddd 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -161,6 +161,8 @@ def combine_parallel_data( # The CoverageException has the file name in it, so just # use the message as the warning. data._warn(str(exc)) + if message: + message(f"Couldn't combine data file {rel_file_name}: {exc}") delete_this_one = False else: data.update(new_data, aliases=aliases) diff --git a/coverage/sqldata.py b/coverage/sqldata.py index eced1616..4baea331 100644 --- a/coverage/sqldata.py +++ b/coverage/sqldata.py @@ -289,6 +289,7 @@ class CoverageData(AutoReprMixin): with self._dbs[threading.get_ident()] as db: try: row = db.execute_one("select version from coverage_schema") + assert row is not None except Exception as exc: if "no such table: coverage_schema" in str(exc): self._init_db(db) @@ -299,7 +300,6 @@ class CoverageData(AutoReprMixin): ) ) from exc else: - assert row is not None schema_version = row[0] if schema_version != SCHEMA_VERSION: raise DataError( |