Merge lp:~james-w/libdep-service/fix-end-to-end-check into lp:libdep-service

[James Westby]

Move the end-to-end check to the v2 API.

Hi,

The end-to-end check is currently broken on staging.

The v1 API was apparently ignoring architecture, so returning results
for both architectures.

When we added v2 we fixed that, which caused the check to start failing.

I've actually updated the check to use the v2 API, as that's the one we
care about, and I don't think we need to check both.

I'm not inclined to worry about breaking v1 compatibility.

Thanks,

James

[Jonathan Lange (jml)]

If https://code.launchpad.net/~jml/libdep-service/update-e2e-check/+merge/130806 lands first, then this will need to change fairly significantly.

Unmerged revisions

66. By James Westby on 2012-10-19

Move the end-to-end check to the v2 API.

=== 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-19 20:01:20 +0000
@@ -7,8 +7,8 @@
 import sys
 
 
-QUERY = 'libs=libc.so.6&libs=notalibrary'
-RESULT = {"libc.so.6": ["libc6", "libc6 (>= 2.13)", "libc6-amd64", "libc6-i386"]}
+QUERY = 'libs=libc.so.6&libs=notalibrary&arch=i386'
+RESULT = {"i386": {"libc.so.6": ["libc6", "libc6 (>= 2.13)", "libc6-amd64"]}}
 
 
 def make_arg_parser():
@@ -69,9 +69,9 @@
             port = ':{0}'.format(args.port)
         else:
             port = ''
-        url = 'http://%s%s/v1/get_binaries_for_libraries' % (args.host, port)
+        url = 'http://%s%s/v2/get_binaries_for_libraries' % (args.host, port)
     else:
-        url = 'http://localhost:8000/v1/get_binaries_for_libraries'
+        url = 'http://localhost:8000/v2/get_binaries_for_libraries'
     if args.error_duration <= args.warn_duration:
         parser.error("error duration must be higher than warning duration")
     code, message = check_query_results(