Merge lp:~matiasb/click-toolbelt/display-upload-sequence into lp:click-toolbelt

[Matias Bordese]

Updated upload to display sequence on success.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~matiasb/click-toolbelt/display-upload-sequence into lp:click-toolbelt failed. Below is the output from the failed tests.

New python executable in .env/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
Downloading/unpacking cliff (from -r requirements.txt (line 1))
  Running setup.py egg_info for package cliff

    Installed /mnt/tarmac/cache/click-toolbelt/trunk/.env/build/cliff/pbr-1.8.1-py2.7.egg
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no files found matching '*.rst' under directory 'docs'
    warning: no files found matching '*.py' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.txt' under directory 'docs'
    warning: no files found matching '*.py' under directory 'tests'
Downloading/unpacking pyxdg (from -r requirements.txt (line 2))
  Running setup.py egg_info for package pyxdg

Downloading/unpacking requests (from -r requirements.txt (line 3))
  Running setup.py egg_info for package requests

Downloading/unpacking requests-oauthlib (from -r requirements.txt (line 4))
  Running setup.py egg_info for package requests-oauthlib

Downloading/unpacking ssoclient (from -r requirements.txt (line 5))
  Downloading ssoclient-2.1.tar.gz
  Running setup.py egg_info for package ssoclient

Downloading/unpacking mock (from -r requirements.txt (line 6))
  Running setup.py egg_info for package mock
    mock requires setuptools>=17.1. Aborting installation
    Complete output from command python setup.py egg_info:
    mock requires setuptools>=17.1. Aborting installation

----------------------------------------
Command python setup.py egg_info failed with error code 1 in /mnt/tarmac/cache/click-toolbelt/trunk/.env/build/mock
Storing complete log in /mnt/tarmac/.pip/pip.log

make: *** [env] Error 1

=== modified file 'click_toolbelt/tests/test_upload.py'
--- click_toolbelt/tests/test_upload.py	2015-04-15 13:51:59 +0000
+++ click_toolbelt/tests/test_upload.py	2015-10-21 17:18:54 +0000
@@ -150,6 +150,7 @@
             'success': False,
             'errors': ['No valid credentials found.'],
             'application_url': '',
+            'sequence': None,
         })
 
     def test_upload_app_uses_environment_variables(self):
@@ -177,7 +178,8 @@
         mock_status_response = self.mock_get.return_value
         mock_status_response.ok = True
         mock_status_response.json.return_value = {
-            'completed': True
+            'completed': True,
+            'sequence': 15,
         }
 
         response = self.command.upload_app(self.package_name, self.data)
@@ -185,6 +187,7 @@
             'success': True,
             'errors': [],
             'application_url': '',
+            'sequence': 15,
         })
 
     def test_upload_app_error_response(self):
@@ -198,6 +201,7 @@
             'success': False,
             'errors': ['server failure'],
             'application_url': '',
+            'sequence': None,
         })
 
     def test_upload_app_handle_malformed_response(self):
@@ -211,6 +215,7 @@
             'success': False,
             'errors': [str(err)],
             'application_url': '',
+            'sequence': None,
         })
 
     def test_upload_app_with_errors_during_scan(self):
@@ -233,7 +238,8 @@
         self.assertEqual(response, {
             'success': False,
             'errors': ['some error'],
-            'application_url': 'http://example.com/myapp'
+            'application_url': 'http://example.com/myapp',
+            'sequence': None,
         })
 
     def test_upload_app_poll_status(self):
@@ -253,7 +259,7 @@
         response_completed.status_code = 200
         response_completed.encoding = 'utf-8'
         response_completed._content = json.dumps(
-            {'completed': True,
+            {'completed': True, 'sequence': 14,
              'application_url': 'http://example.org'}).encode('utf-8')
         self.mock_get.side_effect = [
             response_not_completed,
@@ -265,6 +271,7 @@
             'success': True,
             'errors': [],
             'application_url': 'http://example.org',
+            'sequence': 14,
         })
         self.assertEqual(self.mock_get.call_count, 3)
 
@@ -280,7 +287,7 @@
         ok_response.status_code = 200
         ok_response.encoding = 'utf-8'
         ok_response._content = json.dumps(
-            {'completed': True}).encode('utf-8')
+            {'completed': True, 'sequence': 14}).encode('utf-8')
         nok_response = Response()
         nok_response.status_code = 503
 
@@ -290,6 +297,7 @@
             'success': True,
             'errors': [],
             'application_url': '',
+            'sequence': 14,
         })
         self.assertEqual(self.mock_get.call_count, 3)
 
@@ -316,6 +324,7 @@
                 'http://example.com/status-web/.',
             ],
             'application_url': '',
+            'sequence': None,
         })
 
     def test_upload_app_abort_polling_without_web_status_url(self):
@@ -338,6 +347,7 @@
                 'Package scan took too long.',
             ],
             'application_url': '',
+            'sequence': None,
         })
 
     def test_upload_app_with_metadata(self):

=== modified file 'click_toolbelt/upload.py'
--- click_toolbelt/upload.py	2015-04-15 13:51:59 +0000
+++ click_toolbelt/upload.py	2015-10-21 17:18:54 +0000
@@ -71,9 +71,12 @@
         success = result.get('success', False)
         errors = result.get('errors', [])
         app_url = result.get('application_url', '')
+        sequence = result.get('sequence')
 
         if success:
             self.log.info('Application uploaded successfully.')
+            if sequence:
+                self.log.info('Uploaded as sequence %s.', sequence)
         else:
             self.log.info('Upload did not complete.')
 
@@ -143,7 +146,8 @@
     def upload_app(self, name, upload_data, metadata=None):
         upload_url = self.get_upload_url(name)
 
-        result = {'success': False, 'errors': [], 'application_url': ''}
+        result = {'success': False, 'errors': [],
+                  'application_url': '', 'sequence': None}
 
         session = self.get_oauth_session()
         if session is None:
@@ -169,6 +173,7 @@
                     message = data.get('message', '')
                     if not message:
                         result['success'] = True
+                        result['sequence'] = data.get('sequence')
                     else:
                         result['errors'] = [message]
                 else: