diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/control.py | 5 | ||||
| -rw-r--r-- | coverage/sqldata.py | 20 |
2 files changed, 20 insertions, 5 deletions
diff --git a/coverage/control.py b/coverage/control.py index a4e21295..1001a8d6 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -648,8 +648,9 @@ class Coverage(object): self._warn("No data was collected.", slug="no-data-collected") # Find files that were never executed at all. - for file_path, plugin_name in self._inorout.find_unexecuted_files(): - self._data.touch_file(file_path, plugin_name) + if self._data: + for file_path, plugin_name in self._inorout.find_unexecuted_files(): + self._data.touch_file(file_path, plugin_name) if self.config.note: self._data.add_run_info(note=self.config.note) diff --git a/coverage/sqldata.py b/coverage/sqldata.py index b8efd936..9d44db11 100644 --- a/coverage/sqldata.py +++ b/coverage/sqldata.py @@ -255,8 +255,10 @@ class CoverageSqliteData(SimpleReprMixin): )) self._start_using() self._choose_lines_or_arcs(lines=True) - self._set_context_id() + if not line_data: + return with self._connect() as con: + self._set_context_id() for filename, linenos in iitems(line_data): file_id = self._file_id(filename, add=True) data = [(file_id, self._current_context_id, lineno) for lineno in linenos] @@ -279,8 +281,10 @@ class CoverageSqliteData(SimpleReprMixin): )) self._start_using() self._choose_lines_or_arcs(arcs=True) - self._set_context_id() + if not arc_data: + return with self._connect() as con: + self._set_context_id() for filename, arcs in iitems(arc_data): file_id = self._file_id(filename, add=True) data = [(file_id, self._current_context_id, fromno, tono) for fromno, tono in arcs] @@ -307,6 +311,10 @@ class CoverageSqliteData(SimpleReprMixin): `file_tracers` is { filename: plugin_name, ... } """ + if self._debug.should('dataop'): + self._debug.write("Adding file tracers: %d files" % (len(file_tracers),)) + if not file_tracers: + return self._start_using() with self._connect() as con: for filename, plugin_name in iitems(file_tracers): @@ -667,6 +675,12 @@ class CoverageSqliteData(SimpleReprMixin): class SqliteDb(SimpleReprMixin): + """A simple abstraction over a SQLite database. + + Use as a context manager to get an object you can call + execute or executemany on. + + """ def __init__(self, filename, debug): self.debug = debug if debug.should('sql') else None self.filename = filename @@ -679,7 +693,7 @@ class SqliteDb(SimpleReprMixin): filename = os.path.relpath(self.filename) # It can happen that Python switches threads while the tracer writes # data. The second thread will also try to write to the data, - # effectively causing a nested context. However, given the indempotent + # effectively causing a nested context. However, given the idempotent # nature of the tracer operations, sharing a conenction among threads # is not a problem. if self.debug: |