From 18dbb90b252c2b7b4386fd0b6ebf001d3a248ef8 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 23 Jul 2015 07:36:28 -0400 Subject: Test (and fix!) the secret data dumper. --- coverage/data.py | 24 +++++++----------------- coverage/debug.py | 2 ++ 2 files changed, 9 insertions(+), 17 deletions(-) (limited to 'coverage') diff --git a/coverage/data.py b/coverage/data.py index b0d6838e..77bfd380 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -8,7 +8,7 @@ import socket from coverage import env from coverage.backward import iitems, string_class -from coverage.debug import _TEST_NAME_FILE +from coverage.debug import _TEST_NAME_FILE, pretty_data from coverage.files import PathAliases from coverage.misc import CoverageException, file_be_gone @@ -542,7 +542,7 @@ class CoverageDataFiles(object): os.remove(f) -def debug_main(): +def debug_main(args): """Dump the raw data from data files. Run this as:: @@ -550,22 +550,12 @@ def debug_main(): $ python -m coverage.data [FILE] """ - from coverage.debug import pretty_data - import sys - - if len(sys.argv) > 1: - files = sys.argv[1:] - else: - files = [".coverage"] - - for filename in files: - data = CoverageData._read_raw_data_file(filename) + for filename in (args or [".coverage"]): print("--- {0} ------------------------------".format(filename)) - if data: - print(pretty_data(data)) - else: - print("No data collected") + data = CoverageData._read_raw_data_file(filename) + print(pretty_data(data)) if __name__ == '__main__': - debug_main() + import sys + debug_main(sys.argv[1:]) diff --git a/coverage/debug.py b/coverage/debug.py index e5bb6b0b..45d720c3 100644 --- a/coverage/debug.py +++ b/coverage/debug.py @@ -106,4 +106,6 @@ def pretty_data(data): out = json.dumps(data, indent=4, sort_keys=True) # But pairs of numbers shouldn't be split across lines... out = re.sub(r"\[\s+(-?\d+),\s+(-?\d+)\s+]", r"[\1, \2]", out) + # Trailing spaces mess with tests, get rid of them. + out = re.sub(r"(?m)\s+$", "", out) return out -- cgit v1.2.1