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

[Vincent Ladeuil]

X-Ubuntu-Architecture requirement is more precise now.

X-Ubuntu-Architecture requirement is more precise now.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'tests/api/cpi/test_snaps.py'
--- tests/api/cpi/test_snaps.py	2017-03-21 10:05:43 +0000
+++ tests/api/cpi/test_snaps.py	2017-04-04 07:31:37 +0000
@@ -11,7 +11,7 @@
 from .test_search import SearchTestCase
 
 
-def get_snap_detail(name, series='16', arch='amd64', auth=False):
+def get_snap_detail(name, series='16', arch='amd64', auth=False, params=None):
     url = '{}/api/v1/snaps/details/{}'.format(CPI_ROOT_URL, name)
     headers = {}
     if arch:
@@ -20,14 +20,16 @@
         headers['X-Ubuntu-Series'] = series
     if auth:
         with get_oauth_client() as client:
-            response = client.get(url, headers=headers)
+            response = client.get(url, headers=headers, params=params)
     else:
-        response = requests.get(url, headers=headers)
+        response = requests.get(url, headers=headers, params=params)
     return response
 
 
 class SnapDetailTestCase(APITestCase):
 
+    maxDiff = None
+
     def assert_snap_detail(self, response, name):
         body = response.json()
         fields = [
@@ -106,11 +108,14 @@
             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)
+    def test_get_snap_detail_with_channel_maps_without_arch(self):
+        response = get_snap_detail(
+            SNAP_PACKAGE_NAME, arch=None,
+            params={'fields': 'name,channel,channel_maps_list'})
         self.assert_bad_request(
             response, code='missing-header',
-            message='X-Ubuntu-Architecture header is required.',
+            message=('X-Ubuntu-Architecture header is mandatory when'
+                     ' the channel_maps_list field is requested'),
             new_style_error=True)
 
     def test_get_snap_detail_unauthorized(self):