From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Tue, 4 Dec 2012 06:31:58 +0000 (+0000)
Subject: cli: Use difflib to compare expected vs output.
X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=commitdiff_plain;h=b6576f13699e79b8de73923941a468bbef10c9d7

cli: Use difflib to compare expected vs output.
---

diff --git a/cli_driver.py b/cli_driver.py
index 5139b1d..8016d18 100644
--- a/cli_driver.py
+++ b/cli_driver.py
@@ -24,7 +24,11 @@
 
 '''Test driver for scripts in the cli directory.'''
 
-import json, errno, shutil, subprocess
+import json
+import errno
+import shutil
+import subprocess
+import difflib
 
 from base_driver import *
 
@@ -49,7 +53,10 @@ class CliDriver(Driver):
     def do_expect(self, args):
         expected = json.loads(args)
         if (self.output != expected):
-            fail("Unexpected output:\n    Expected: %s\n    Received: %s\n" % (expected, self.output))
+            differ = difflib.Differ()
+            diff = differ.compare(expected.splitlines(1), self.output.splitlines(1))
+            diff = ''.join(diff)
+            fail("Unexpected output:\n%s\n" % diff)
 
     def do_rm_and_mkdir(self, args):