Merge lp:~ricardokirkner/ols-store-tests/retry-release-snap into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Ricardo Kirkner]

retry releasing snap if request fails

[lp:~ricardokirkner/ols-store-tests/retry-release-snap]

18. By Ricardo Kirkner on 2016-07-06

retry releasing snap if request fails

19. By Ricardo Kirkner on 2016-07-06

added missing import

20. By Ricardo Kirkner on 2016-07-07

log about retrying to release

21. By Ricardo Kirkner on 2016-07-07

fixed typo

[Fabián Ezequiel Gallina (fgallina)]

LGTM

It should be possible at some point that the retry logic consist of polling the status_url until it gives an OK and then the release is retried.

review: Approve

[lp:~ricardokirkner/ols-store-tests/retry-release-snap]

22. By Ricardo Kirkner on 2016-07-07

refactor code to poll for status before retrying to release

[Ricardo Kirkner (ricardokirkner)]

review: Approve

=== modified file 'tests/api/snap/test_snap_release.py'
--- tests/api/snap/test_snap_release.py	2016-06-24 20:15:28 +0000
+++ tests/api/snap/test_snap_release.py	2016-07-07 15:51:49 +0000
@@ -1,5 +1,7 @@
+import json
+import logging
+import time
 import uuid
-import json
 
 import requests
 
@@ -13,7 +15,11 @@
 from .test_snap_push import push_snap
 
 
-def release_snap(name=None, revision=None, channels=None, auth=None):
+RELEASE_SNAP_RETRY_WAIT = 30
+
+
+def release_snap(name=None, revision=None, channels=None,
+                 auth=None, retry=True, status_url=None):
     headers = {
         'Content-Type': 'application/json',
     }
@@ -30,6 +36,28 @@
 
     url = '{}/dev/api/snap-release/'.format(SCA_ROOT_URL)
     response = requests.post(url, data=json.dumps(data), headers=headers)
+
+    if retry and response.status_code == 409:
+        if status_url is not None:
+            response = poll_until_processed(status_url)
+        else:
+            logging.info(
+                'Failed to release: data=%s. Retrying in %s seconds.',
+                data, RELEASE_SNAP_RETRY_WAIT)
+            time.sleep(RELEASE_SNAP_RETRY_WAIT)
+        response = requests.post(url, data=json.dumps(data), headers=headers)
+
+    return response
+
+
+def poll_until_processed(status_url):
+    response = get_snap_status(status_url)
+    # TODO: how to avoid looping forever here in some sensible way?
+    while not is_processed(response):
+        response = get_snap_status(status_url)
+    if not can_release(response):
+        self.fail('Unexpected error. Can not release package. '
+                  'Status: {}'.format(response.json()))
     return response
 
 
@@ -105,17 +133,11 @@
         updown_id, version = upload_snap(self.name)
         response = push_snap(self.name, updown_id, auth=self.auth)
         status_url = get_snap_status_url(response)
-        response = get_snap_status(status_url)
-        # TODO: how to avoid looping forever here in some sensible way?
-        while not is_processed(response):
-            response = get_snap_status(status_url)
-        if not can_release(response):
-            self.fail('Unexpected error. Can not release package. '
-                      'Status: {}'.format(response.json()))
+        response = poll_until_processed(status_url)
 
         revision = get_snap_revision(response)
         response = release_snap(self.name, revision, self.channels,
-                                auth=self.auth)
+                                auth=self.auth, status_url=status_url)
         self.assert_success(response)
         self.assert_success_body(response, version, revision)