1
=== modified file 'bin/end-to-end-check'
2
--- bin/end-to-end-check	2012-09-14 14:34:46 +0000
3
+++ bin/end-to-end-check	2012-10-22 12:48:23 +0000
4
@@ -2,13 +2,24 @@
5
2
2
6
3
import argparse
3
import argparse
7
4
import json
4
import json
8
5
from operator import itemgetter
9
5
import time
6
import time
10
6
import urllib2
7
import urllib2
11
7
import sys
8
import sys
12
8
9
13
10
from testtools.matchers import (
14
11
    AfterPreprocessing,
15
12
    Contains,
16
13
    KeysEqual,
17
14
    MatchesAll,
18
15
    )
19
16
20
9
17
21
10
QUERY = 'libs=libc.so.6&libs=notalibrary'
18
QUERY = 'libs=libc.so.6&libs=notalibrary'
23
11
RESULT = {"libc.so.6": ["libc6", "libc6 (>= 2.13)", "libc6-amd64", "libc6-i386"]}
19
# Using only testtools 0.9.14 matchers, as that's what's on emim.
24
20
RESULT = MatchesAll(
25
21
    KeysEqual('libc.so.6'),
26
22
    AfterPreprocessing(itemgetter('libc.so.6'), Contains('libc6')))
27
12
23
28
13
24
29
14
def make_arg_parser():
25
def make_arg_parser():
30
@@ -39,15 +50,16 @@
31
39
    return json.loads(result)
50
    return json.loads(result)
32
40
51
33
41
52
35
42
def check_query_results(warn_duration, error_duration, expected_result,
53
def check_query_results(warn_duration, error_duration, result_matcher,
36
43
                        function, *args, **kwargs):
54
                        function, *args, **kwargs):
37
44
    start_time = time.time()
55
    start_time = time.time()
38
45
    result = function(*args, **kwargs)
56
    result = function(*args, **kwargs)
39
46
    duration = time.time() - start_time
57
    duration = time.time() - start_time
40
58
    mismatch = result_matcher.match(result)
41
47
    # XXX: If we could guarantee matchers gave a one-line output, we would
59
    # XXX: If we could guarantee matchers gave a one-line output, we would
42
48
    # probably use matchers for this rather than assuming simple equality.
60
    # probably use matchers for this rather than assuming simple equality.
45
49
    if result != expected_result:
61
    if mismatch:
46
50
        return 2, "ERROR: Got %r, expected %r" % (result, expected_result)
62
        return 2, "ERROR: %s" % (mismatch.describe().replace('\n', '; '),)
47
51
    elif duration > error_duration:
63
    elif duration > error_duration:
48
52
        return 2, "ERROR: Check took %0.3fs.  Must be less than %0.3fs" % (
64
        return 2, "ERROR: Check took %0.3fs.  Must be less than %0.3fs" % (
49
53
            duration, error_duration)
65
            duration, error_duration)
Status:	Merged
Approved by:	James Westby on 2012-10-22
Approved revision:	68
Merged at revision:	66
Proposed branch:	lp:~jml/libdep-service/update-e2e-check
Merge into:	lp:libdep-service
Diff against target:	49 lines (+16/-4) 1 file modified bin/end-to-end-check (+16/-4)
To merge this branch:	bzr merge lp:~jml/libdep-service/update-e2e-check
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
James Westby (community)		2012-10-22	Approve on 2012-10-22
Review via email: mp+130806@code.launchpad.net