From 0ed5b7355a75fc696cd33cff8eaab13637b97803 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 18 Feb 2021 11:51:51 +0200 Subject: fix: drop unwanted empty lines from output It turns out that something (serde_yaml) now outputs a newline at the of a document. println! adds a second. Tests don't expect the extra one so use print! instead. Also, drop the temporary workaround. --- subplot/summain.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'subplot') diff --git a/subplot/summain.py b/subplot/summain.py index 0a53b08..4bde65c 100644 --- a/subplot/summain.py +++ b/subplot/summain.py @@ -54,12 +54,6 @@ def output_matches_file(ctx, filename=None): actual = runcmd_get_stdout(ctx) expected = get_file(filename).decode("UTF-8") - # For some reason, in CI actual has an extra newline at the end. I have - # failed to find why. As a workaround, stripping it here. - if actual.endswith("\n\n"): - print("FIXME: stripping extra newline from actual output") - actual = actual[:-1] - diff = "".join( line.rstrip("\n") + "\n" for line in difflib.unified_diff( -- cgit v1.2.1