1 files changed, 19 insertions, 13 deletions
diff --git a/xlate-test.py b/xlate-test.py
index 006289f3..37760e96 100755
--- a/xlate-test.py
+++ b/xlate-test.py
@@ -4,8 +4,8 @@
 import os
 import sys
 import shlex
-import subprocess
 import argparse
+from subprocess import Popen, PIPE
 
 keywords = ("iptables-translate", "ip6tables-translate")
 
@@ -40,19 +40,25 @@ def run_test(name, payload):
 
     for line in payload:
         if line.startswith(keywords):
-            output = subprocess.run(shlex.split(line), stdout=subprocess.PIPE)
-            translation = output.stdout.decode("utf-8").rstrip(" \n")
-            expected = next(payload).rstrip(" \n")
-            if translation != expected:
-                result.append(red("Fail"))
-                result.append(magenta("src: ") + line.rstrip(" \n"))
-                result.append(magenta("exp: ") + expected)
-                result.append(magenta("res: ") + translation + "\n")
+            process = Popen(shlex.split(line), stdout=PIPE, stderr=PIPE)
+            (output, error) = process.communicate()
+            if process.returncode == 0:
+                translation = output.decode("utf-8").rstrip(" \n")
+                expected = next(payload).rstrip(" \n")
+                if translation != expected:
+                    result.append(red("Fail"))
+                    result.append(magenta("src: ") + line.rstrip(" \n"))
+                    result.append(magenta("exp: ") + expected)
+                    result.append(magenta("res: ") + translation + "\n")
+                    test_passed = False
+                elif args.all:
+                    result.append(green("Ok"))
+                    result.append(magenta("src: ") + line.rstrip(" \n"))
+                    result.append(magenta("res: ") + translation + "\n")
+            else:
                 test_passed = False
-            elif args.all:
-                result.append(green("Ok"))
-                result.append(magenta("src: ") + line.rstrip(" \n"))
-                result.append(magenta("res: ") + translation + "\n")
+                result.append(red("Error: ") + "iptables-translate failure")
+                result.append(error.decode("utf-8"))
 
     if not test_passed or args.all:
         print("\n".join(result))