Merge lp:~vila/ols-store-tests/x-ubuntu-arch into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Vincent Ladeuil]

X-Ubuntu-Architecture is now mandatory. Report better errors in cpi.assert_{success,not_found}.

cpi now requires X-Ubuntu-Architecture.

Fix failures, add a test for requests without architecture.

Improve error reporting.

[Para Siva (psivaa)]

LGTM. Just a tiny nit of a comment. Feel free to ignore.

review: Approve

[Vincent Ladeuil (vila)]

fixed, thanks for the heads-up.

[lp:~vila/ols-store-tests/x-ubuntu-arch]

44. By Vincent Ladeuil on 2017-03-21

Simplify errror reporting, py3 unittest already prepends the assertion itself.

=== modified file 'tests/api/cpi/helpers.py'
--- tests/api/cpi/helpers.py	2016-09-14 20:05:35 +0000
+++ tests/api/cpi/helpers.py	2017-03-21 10:30:28 +0000
@@ -65,12 +65,12 @@
 class APITestCase(unittest.TestCase):
 
     def assert_success(self, response, content_type='application/hal+json'):
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 200, response.content)
         self.assertEqual(response.headers['Content-Type'],
                          content_type)
 
     def assert_not_found(self, response, message=None, new_style_error=False):
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 404, response.content)
         self.assertEqual(response.headers['Content-Type'],
                          'application/hal+json')
         expected = {

=== modified file 'tests/api/cpi/test_snaps.py'
--- tests/api/cpi/test_snaps.py	2017-03-13 11:55:37 +0000
+++ tests/api/cpi/test_snaps.py	2017-03-21 10:30:28 +0000
@@ -11,9 +11,11 @@
 from .test_search import SearchTestCase
 
 
-def get_snap_detail(name, series='16', auth=False):
+def get_snap_detail(name, series='16', arch='amd64', auth=False):
     url = '{}/api/v1/snaps/details/{}'.format(CPI_ROOT_URL, name)
     headers = {}
+    if arch:
+        headers['X-Ubuntu-Architecture'] = arch
     if series:
         headers['X-Ubuntu-Series'] = series
     if auth:
@@ -104,6 +106,13 @@
             message='X-Ubuntu-Series header is required.',
             new_style_error=True)
 
+    def test_get_snap_detail_without_arch(self):
+        response = get_snap_detail(SNAP_PACKAGE_NAME, arch=None)
+        self.assert_bad_request(
+            response, code='missing-header',
+            message='X-Ubuntu-Architecture header is required.',
+            new_style_error=True)
+
     def test_get_snap_detail_unauthorized(self):
         response = get_snap_detail(PRIVATE_SNAP_PACKAGE_NAME, auth=False)
         self.assert_not_found(response, message='No such package',