Merge lp:~kelvin.li/ols-store-tests/store-acceptance-tests-fix-registername-new-format into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Kelvin Li]

fix the testcase failure by introducing the new error format for RegisterName endpoint

fix the testcase failure by introducing the new error format for RegisterName endpoint

[Kelvin Li (kelvin.li)]

the testcases now are passed, except the case for 'already claimed name', can't have it passed with my own account on staging env, I suspect there're sort of *already claimed* snap names with Ricardo's tset account.

Since I saw the parameter setup in https://jenkins.ubuntone.info/job/store-acceptance-tests-staging/388/console
<email address hidden>
TEST_USER_NAMESPACE=store-acceptance

If that is the case, that testcase should be fine.
Otherwise, let me know what I missed.

Anyway, I push this MP for the review now.

[Ricardo Kirkner (ricardokirkner)]

review: Approve

=== modified file 'tests/api/snap/helpers.py'
--- tests/api/snap/helpers.py	2016-08-18 12:49:56 +0000
+++ tests/api/snap/helpers.py	2016-08-24 05:45:13 +0000
@@ -169,7 +169,7 @@
             response.status_code, response.content))
         self.assertEqual(response.headers['Content-Type'], content_type)
 
-    def assert_error(self, response, content_type='application/problem+json'):
+    def assert_error(self, response, content_type='application/json'):
         self.assertFalse(response.ok, 'Response was: [{}] {}'.format(
             response.status_code, response.content))
         self.assertEqual(response.headers['Content-Type'], content_type)

=== modified file 'tests/api/snap/test_register_name.py'
--- tests/api/snap/test_register_name.py	2016-07-19 15:25:51 +0000
+++ tests/api/snap/test_register_name.py	2016-08-24 05:45:13 +0000
@@ -69,6 +69,10 @@
             'title': 'Name already registered.',
             'detail': "You already registered a claim for '%s'." % name,
             'type': 'devportal:v1:name-already-registered',
+            'error_list': [{
+                'code': 'already_claimed',
+                'message': "You already registered a claim for '%s'." % name
+            }]
         }
         self.assertEqual(body, expected)
 
@@ -81,6 +85,10 @@
             'title': 'Name already registered.',
             'detail': "You already own '%s'." % name,
             'type': 'devportal:v1:name-already-registered',
+            'error_list': [{
+                'code': 'already_owned',
+                'message': "You already own '%s'." % name
+            }]
         }
         self.assertEqual(body, expected)
 
@@ -98,6 +106,10 @@
             'suggested_snap_name': '{}-{}'.format(TEST_USER_NAMESPACE, name),
             'register_name_url': register_name_url,
             'type': 'devportal:v1:name-already-registered',
+            'error_list': [{
+                'code': 'already_registered',
+                'message': "'%s' is already registered." % name
+            }]
         }
         self.assertEqual(body, expected)
 
@@ -115,6 +127,10 @@
             'suggested_snap_name': '{}-{}'.format(TEST_USER_NAMESPACE, name),
             'register_name_url': register_name_url,
             'type': 'devportal:v1:name-reserved',
+            'error_list': [{
+                'code': 'reserved_name',
+                'message': "'%s' is a reserved name." % name
+            }]
         }
         self.assertEqual(body, expected)
 
@@ -131,6 +147,11 @@
                     'registration for 16.',
             'retry_after': int(retry_after),
             'type': u'devportal:v1:name-window-wait',
+            'error_list': [{
+                'code': 'register_window',
+                'message': 'You must wait 1\xa0minute before the next snap-name '
+                        'registration for 16.',
+            }]
         }
         self.assertEqual(body, expected)
 
@@ -148,6 +169,10 @@
             'type': 'devportal:v1:request-invalid',
             'detail': 'Submitted data is not valid.',
             'title': 'Invalid request.',
+            'error_list': [{
+                'message': 'Select a valid choice. That choice is not one of the available choices.',
+                'code': 'invalid_choice',
+                'extra': {'name': 'series'}}]
         }
         self.assertEqual(body, expected)
 
@@ -219,4 +244,4 @@
         auth = authenticate_with_macaroon(permissions=['package_access'])
         response = register_name(self.package_name, auth=auth)
         self.assert_error(response)
-        self.assert_forbidden(response)
+        self.assert_forbidden(response, new_style=True)