Merge lp:~facundo/ols-store-tests/store-acceptance-tests--fix-new-format-1 into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Facundo Batista]

Support new format error for Release.

Support new format error for Release.

Also included a couple of small improvements at project level.

[Ricardo Kirkner (ricardokirkner)]

lgtm

review: Approve

=== modified file 'README'
--- README	2016-06-29 11:11:11 +0000
+++ README	2016-08-18 15:26:14 +0000
@@ -5,7 +5,7 @@
 0. Setup the environment
 
 Because the tests rely on certain dependencies that are only available on
-Ubuntu 16.10 or later, the supported way to run these tests is using LXCs.
+Ubuntu 16.04 or later, the supported way to run these tests is using LXCs.
 There's some additional documentation on LXC gotchas in the following
 page (check there specially if you can't resolve the lxc address when
 ssh'ing and if you want to open GUI apps seeing them in your host machine):
@@ -57,11 +57,10 @@
 
 .. note::
 
-   If you want to run a sub set of the tests only, you can do so providing ARGS, for example
-
-     $ make api-tests ARGS=-p test_snap_push.py
-
-   to run only the snap push tests.
+   If you want to run a sub set of the tests only, you should do...
+
+     $ make api-tests TEST_TARGET=tests.api.snap.test_snap_release
+     $ make api-tests TEST_TARGET=tests.api.snap.test_snap_release.SnapReleaseTestCase.test_release_snap_require_package_upload_permission
 
 Tests are run against staging by default. If you want to run the tests against a local instance
 of devportal, you need to:

=== modified file 'dependencies.txt'
--- dependencies.txt	2016-06-24 20:16:30 +0000
+++ dependencies.txt	2016-08-18 15:26:14 +0000
@@ -1,3 +1,4 @@
+make
 squashfs-tools
 snapcraft
 python3-pymacaroons

=== modified file 'tests/api/snap/helpers.py'
--- tests/api/snap/helpers.py	2016-06-30 18:47:38 +0000
+++ tests/api/snap/helpers.py	2016-08-18 15:26:14 +0000
@@ -177,7 +177,7 @@
     def assert_require_auth(self, response):
         self.assertEqual(response.status_code, 401)
 
-    def assert_forbidden(self, response):
+    def assert_forbidden(self, response, new_style=False):
         self.assertEqual(response.status_code, 403)
         body = response.json()
         expected = {
@@ -187,6 +187,11 @@
             "detail": "Permission is required: package_upload",
             "title": "Macaroon missing required permission.",
         }
+        if new_style:
+            expected["error_list"] = [{
+                "code": "macaroon-permission-required",
+                "message": "Permission is required: package_upload",
+            }]
         self.assertEqual(body, expected)
 
     def assert_not_found(self, response):

=== modified file 'tests/api/snap/test_snap_release.py'
--- tests/api/snap/test_snap_release.py	2016-07-19 11:42:50 +0000
+++ tests/api/snap/test_snap_release.py	2016-08-18 15:26:14 +0000
@@ -125,6 +125,16 @@
                 'revision': ['This field is required.'],
             },
             'success': False,
+            'error_list': [{
+                'code': 'missing-field',
+                'message': "The 'channels' field is required",
+            }, {
+                'code': 'missing-field',
+                'message': "The 'name' field is required",
+            }, {
+                'code': 'missing-field',
+                'message': "The 'revision' field is required",
+            }],
         }
         self.assertEqual(body, expected)
 
@@ -157,5 +167,5 @@
         auth = authenticate_with_macaroon(permissions=['package_access'])
         response = release_snap(self.name, self.revision, self.channels,
                                 auth=auth)
-        self.assert_error(response)
-        self.assert_forbidden(response)
+        self.assert_error(response, content_type='application/json')
+        self.assert_forbidden(response, new_style=True)