Merge lp:~ricardokirkner/ols-store-tests/cpi-tests-new-style-errors into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Ricardo Kirkner]

fixed cpi tests after service started returning new-style error responses

[lp:~ricardokirkner/ols-store-tests/cpi-tests-new-style-errors]

32. By Ricardo Kirkner on 2016-09-14

support both old and new-style error responses

=== modified file 'tests/api/cpi/helpers.py'
--- tests/api/cpi/helpers.py	2016-07-07 19:12:03 +0000
+++ tests/api/cpi/helpers.py	2016-09-14 20:05:56 +0000
@@ -69,25 +69,38 @@
         self.assertEqual(response.headers['Content-Type'],
                          content_type)
 
-    def assert_not_found(self, response, message=None):
+    def assert_not_found(self, response, message=None, new_style_error=False):
         self.assertEqual(response.status_code, 404)
         self.assertEqual(response.headers['Content-Type'],
                          'application/hal+json')
-        self.assertEqual(response.json(), {
+        expected = {
             'result': 'error',
             'errors': [message or 'Not found'],
-        })
+        }
+        if new_style_error:
+            expected['error_list'] = [
+                {'code': 'resource-not-found', 'message': message},
+            ]
+        self.assertEqual(response.json(), expected)
 
-    def assert_bad_request(self, response, message):
+    def assert_bad_request(self, response, message, code='',
+                           new_style_error=False):
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.headers['Content-Type'],
                          'application/hal+json')
-        self.assertEqual(response.json(), {
+        expected = {
             'result': 'error',
             'errors': [message],
-        })
+        }
+        if new_style_error:
+            expected['error_list'] = [
+                {'code': code, 'message': message},
+            ]
+
+        self.assertEqual(response.json(), expected)
 
     def assert_unauthorized(self, response):
         self.assertEqual(response.status_code, 401)
-        self.assertEqual(response.headers['Content-Type'], 'text/plain')
+        self.assertEqual(response.headers['Content-Type'],
+                         'application/hal+json')
         self.assertIn('WWW-Authenticate', response.headers)

=== modified file 'tests/api/cpi/test_metadata.py'
--- tests/api/cpi/test_metadata.py	2016-07-07 19:49:49 +0000
+++ tests/api/cpi/test_metadata.py	2016-09-14 20:05:56 +0000
@@ -154,12 +154,16 @@
         response = self.get_metadata()
         self.assert_bad_request(
             response,
-            message='Packages must be specified in parameter "snaps".')
+            code='missing-field',
+            message='Packages must be specified in parameter "snaps".',
+            new_style_error=True)
 
     def test_get_metadata_missing_snap_id(self):
         response = self.get_metadata(snaps=[{}])
         self.assert_bad_request(
-            response, message='Missing snap_id for snap.')
+            response, code='missing-field',
+            message='Missing snap_id for snap.',
+            new_style_error=True)
 
     def test_get_metadata_filter_fields(self):
         fields = ['channel', 'revision', 'snap_id']

=== modified file 'tests/api/cpi/test_snaps.py'
--- tests/api/cpi/test_snaps.py	2016-07-07 19:49:49 +0000
+++ tests/api/cpi/test_snaps.py	2016-09-14 20:05:56 +0000
@@ -101,15 +101,19 @@
     def test_get_snap_detail_without_series(self):
         response = get_snap_detail(SNAP_PACKAGE_NAME, series=None)
         self.assert_bad_request(
-            response, message='X-Ubuntu-Series header is required.')
+            response, code='missing-header',
+            message='X-Ubuntu-Series 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')
+        self.assert_not_found(response, message='No such package',
+                              new_style_error=True)
 
     def test_get_snap_detail_not_found(self):
         response = get_snap_detail('missing')
-        self.assert_not_found(response, message='No such package')
+        self.assert_not_found(response, message='No such package',
+                              new_style_error=True)
 
 
 class SnapMetadataTestCase(MetadataTestCase):