From 96269ab63bcbb0bc7d5520e1dc8226608275889d Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 21 Jan 2018 18:04:22 -0500 Subject: Raise an error if combine can't find usable data files. #629 --- coverage/data.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'coverage') diff --git a/coverage/data.py b/coverage/data.py index ecfb86b..6f76a72 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -722,6 +722,7 @@ class CoverageDataFiles(object): if strict and not files_to_combine: raise CoverageException("No data to combine") + files_combined = 0 for f in files_to_combine: new_data = CoverageData(debug=self.debug) try: @@ -733,10 +734,14 @@ class CoverageDataFiles(object): self.warn(str(exc)) else: data.update(new_data, aliases=aliases) + files_combined += 1 if self.debug and self.debug.should('dataio'): self.debug.write("Deleting combined data file %r" % (f,)) file_be_gone(f) + if strict and not files_combined: + raise CoverageException("No usable data files") + def canonicalize_json_data(data): """Canonicalize our JSON data so it can be compared.""" -- cgit v1.2.1