diff mbox series

[iptables] tests: iptables-test: Use difflib if dumps differ

Message ID 20231220151353.25210-1-phil@nwl.cc
State Accepted
Headers show
Series [iptables] tests: iptables-test: Use difflib if dumps differ | expand

Commit Message

Phil Sutter Dec. 20, 2023, 3:13 p.m. UTC 
Improve log readability by printing a unified diff of the expected vs.
actual iptables-save output.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 iptables-test.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

Phil Sutter Dec. 21, 2023, 1:35 p.m. UTC | #1 
On Wed, Dec 20, 2023 at 04:13:53PM +0100, Phil Sutter wrote:
> Improve log readability by printing a unified diff of the expected vs.
> actual iptables-save output.
> 
> Signed-off-by: Phil Sutter <phil@nwl.cc>

Patch applied.
diff mbox series

Patch

diff --git a/iptables-test.py b/iptables-test.py
index 6f63cdbeda9af..179e366e02961 100755
--- a/iptables-test.py
+++ b/iptables-test.py
@@ -15,6 +15,7 @@  import sys
 import os
 import subprocess
 import argparse
+from difflib import unified_diff
 
 IPTABLES = "iptables"
 IP6TABLES = "ip6tables"
@@ -367,11 +368,12 @@  STDERR_IS_TTY = sys.stderr.isatty()
 
     out = out.decode('utf-8').rstrip()
     if out.find(out_expect) < 0:
-        msg = ["dumps differ!"]
-        msg.extend(["expect: " + l for l in out_expect.split("\n")])
-        msg.extend(["got: " + l for l in out.split("\n")
-                                if not l[0] in ['*', ':', '#']])
-        print("\n".join(msg), file=log_file)
+        print("dumps differ!", file=log_file)
+        out_clean = [ l for l in out.split("\n")
+                        if not l[0] in ['*', ':', '#']]
+        diff = unified_diff(out_expect.split("\n"), out_clean,
+                            fromfile="expect", tofile="got", lineterm='')
+        print("\n".join(diff), file=log_file)
         return -1
 
     return tests