Merge lp:~jml/libdep-service/update-e2e-check into lp:libdep-service

[Jonathan Lange]

Make e2e check more flexible

Uses a matcher for the e2e check so that we aren't constantly baffled
by slight changes in returned data.

[James Westby (james-w)]

review: Approve

=== modified file 'bin/end-to-end-check'
--- bin/end-to-end-check	2012-09-14 14:34:46 +0000
+++ bin/end-to-end-check	2012-10-22 12:48:23 +0000
@@ -2,13 +2,24 @@
 
 import argparse
 import json
+from operator import itemgetter
 import time
 import urllib2
 import sys
 
+from testtools.matchers import (
+    AfterPreprocessing,
+    Contains,
+    KeysEqual,
+    MatchesAll,
+    )
+
 
 QUERY = 'libs=libc.so.6&libs=notalibrary'
-RESULT = {"libc.so.6": ["libc6", "libc6 (>= 2.13)", "libc6-amd64", "libc6-i386"]}
+# Using only testtools 0.9.14 matchers, as that's what's on emim.
+RESULT = MatchesAll(
+    KeysEqual('libc.so.6'),
+    AfterPreprocessing(itemgetter('libc.so.6'), Contains('libc6')))
 
 
 def make_arg_parser():
@@ -39,15 +50,16 @@
     return json.loads(result)
 
 
-def check_query_results(warn_duration, error_duration, expected_result,
+def check_query_results(warn_duration, error_duration, result_matcher,
                         function, *args, **kwargs):
     start_time = time.time()
     result = function(*args, **kwargs)
     duration = time.time() - start_time
+    mismatch = result_matcher.match(result)
     # XXX: If we could guarantee matchers gave a one-line output, we would
     # probably use matchers for this rather than assuming simple equality.
-    if result != expected_result:
-        return 2, "ERROR: Got %r, expected %r" % (result, expected_result)
+    if mismatch:
+        return 2, "ERROR: %s" % (mismatch.describe().replace('\n', '; '),)
     elif duration > error_duration:
         return 2, "ERROR: Check took %0.3fs.  Must be less than %0.3fs" % (
             duration, error_duration)