summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2013-04-21 23:13:58 -0400
committerNed Batchelder <ned@nedbatchelder.com>2013-04-21 23:13:58 -0400
commitdc57e1a9e3188e88df88ea48c5d725be8ab21f52 (patch)
tree6a43d96e0ae67a73e387f43ea7824f29541b4d2c /coverage/control.py
parent9eebc5f21c4d7def572fedc1eea4ec0a1c544b56 (diff)
downloadpython-coveragepy-dc57e1a9e3188e88df88ea48c5d725be8ab21f52.tar.gz
I like it better like this.
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py60
1 files changed, 31 insertions, 29 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 09bd75f..8821bfb 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -479,35 +479,37 @@ class coverage(object):
Also warn about various problems collecting data.
"""
- if self._measured:
- self.data.add_line_data(self.collector.get_line_data())
- self.data.add_arc_data(self.collector.get_arc_data())
- self.collector.reset()
-
- # If there are still entries in the source_pkgs list, then we never
- # encountered those packages.
- if self._warn_unimported_source:
- for pkg in self.source_pkgs:
- self._warn("Module %s was never imported." % pkg)
-
- # Find out if we got any data.
- summary = self.data.summary()
- if not summary and self._warn_no_data:
- self._warn("No data was collected.")
-
- # Find files that were never executed at all.
- for src in self.source:
- for py_file in find_python_files(src):
- py_file = self.file_locator.canonical_filename(py_file)
-
- if self.omit_match and self.omit_match.match(py_file):
- # Turns out this file was omitted, so don't pull it
- # back in as unexecuted.
- continue
-
- self.data.touch_file(py_file)
-
- self._measured = False
+ if not self._measured:
+ return
+
+ self.data.add_line_data(self.collector.get_line_data())
+ self.data.add_arc_data(self.collector.get_arc_data())
+ self.collector.reset()
+
+ # If there are still entries in the source_pkgs list, then we never
+ # encountered those packages.
+ if self._warn_unimported_source:
+ for pkg in self.source_pkgs:
+ self._warn("Module %s was never imported." % pkg)
+
+ # Find out if we got any data.
+ summary = self.data.summary()
+ if not summary and self._warn_no_data:
+ self._warn("No data was collected.")
+
+ # Find files that were never executed at all.
+ for src in self.source:
+ for py_file in find_python_files(src):
+ py_file = self.file_locator.canonical_filename(py_file)
+
+ if self.omit_match and self.omit_match.match(py_file):
+ # Turns out this file was omitted, so don't pull it back
+ # in as unexecuted.
+ continue
+
+ self.data.touch_file(py_file)
+
+ self._measured = False
# Backward compatibility with version 1.
def analysis(self, morf):