Merge lp:~ricardokirkner/click-toolbelt/fix-storeapi-upload-missing-config into lp:click-toolbelt

[Ricardo Kirkner]

fix storeapi upload functions invalid calls to get_oauth_session without config

[Fabián Ezequiel Gallina (fgallina)]

LGTM

review: Approve

=== modified file 'click_toolbelt/tests/test_upload.py'
--- click_toolbelt/tests/test_upload.py	2016-01-08 14:20:13 +0000
+++ click_toolbelt/tests/test_upload.py	2016-01-08 19:30:10 +0000
@@ -62,10 +62,11 @@
 
         self.command.take_action(self.args)
 
-        self.mock_upload_files.assert_called_once_with(binary_filename)
+        self.mock_upload_files.assert_called_once_with(
+            binary_filename, config=None)
         self.mock_upload_app.assert_called_once_with(
             self.package_name, self.mock_upload_files.return_value,
-            metadata={})
+            metadata={}, config=None)
         self.mock_logger.info.assert_any_call(
             'Application uploaded successfully.'
         )
@@ -76,10 +77,11 @@
 
         self.command.take_action(args)
 
-        self.mock_upload_files.assert_called_once_with(binary_filename)
+        self.mock_upload_files.assert_called_once_with(
+            binary_filename, config=None)
         self.mock_upload_app.assert_called_once_with(
             self.package_name, self.mock_upload_files.return_value,
-            metadata={})
+            metadata={}, config=None)
         self.mock_logger.info.assert_any_call(
             'Application uploaded successfully.'
         )
@@ -96,10 +98,10 @@
         self.command.take_action(args)
 
         self.mock_upload_files.assert_called_once_with(
-            self.binary_filename)
+            self.binary_filename, config=None)
         self.mock_upload_app.assert_called_once_with(
             self.package_name, self.mock_upload_files.return_value,
-            metadata={'changelog': 'some changes'})
+            metadata={'changelog': 'some changes'}, config=None)
         self.mock_logger.info.assert_any_call(
             'Application uploaded successfully.'
         )
@@ -116,10 +118,10 @@
         self.command.take_action(args)
 
         self.mock_upload_files.assert_called_once_with(
-            self.binary_filename)
+            self.binary_filename, config=None)
         self.mock_upload_app.assert_called_once_with(
             self.package_name, self.mock_upload_files.return_value,
-            metadata={'changelog': 'some changes'})
+            metadata={'changelog': 'some changes'}, config=None)
         self.mock_logger.info.assert_any_call(
             'Application uploaded successfully.'
         )
@@ -136,7 +138,7 @@
             self.command.take_action(self.args)
 
         self.mock_upload_files.assert_called_once_with(
-            binary_filename)
+            binary_filename, config=None)
         self.assertFalse(self.mock_upload_app.called)
         self.mock_logger.info.assert_any_call(
             'Upload failed:\n\n%s\n', 'some error')
@@ -153,10 +155,10 @@
             self.command.take_action(self.args)
 
         self.mock_upload_files.assert_called_once_with(
-            binary_filename)
+            binary_filename, config=None)
         self.mock_upload_app.assert_called_once_with(
             self.package_name, self.mock_upload_files.return_value,
-            metadata={})
+            metadata={}, config=None)
         self.mock_logger.info.assert_any_call(
             'Upload did not complete.')
         self.mock_logger.info.assert_any_call(
 
=== modified file 'storeapi/_upload.py'
--- storeapi/_upload.py	2016-01-08 14:20:09 +0000
+++ storeapi/_upload.py	2016-01-08 19:30:10 +0000
@@ -23,7 +23,7 @@
 logger = logging.getLogger(__name__)
 
 
-def upload(binary_filename, metadata_filename='', metadata=None):
+def upload(binary_filename, metadata_filename='', metadata=None, config=None):
     """Create a new upload based on a click/snap package."""
 
     # validate package filename
@@ -36,7 +36,7 @@
     name = match.groupdict()['name']
 
     logger.info('Uploading files...')
-    data = upload_files(binary_filename)
+    data = upload_files(binary_filename, config=config)
     success = data.get('success', False)
     errors = data.get('errors', [])
     if not success:
@@ -46,7 +46,7 @@
     logger.info('Uploading new version...')
     meta = read_metadata(metadata_filename)
     meta.update(metadata or {})
-    result = upload_app(name, data, metadata=meta)
+    result = upload_app(name, data, metadata=meta, config=config)
     success = result.get('success', False)
     errors = result.get('errors', [])
     app_url = result.get('application_url', '')
@@ -70,7 +70,7 @@
     return success
 
 
-def upload_files(binary_filename):
+def upload_files(binary_filename, config=None):
     """Upload a binary file to the Store.
 
     Submit a file to the click-updown service and return the
@@ -83,7 +83,7 @@
 
     result = {'success': False, 'errors': []}
 
-    session = get_oauth_session()
+    session = get_oauth_session(config)
     if session is None:
         result['errors'] = ['No valid credentials found.']
         return result
@@ -131,14 +131,14 @@
     return metadata
 
 
-def upload_app(name, upload_data, metadata=None):
+def upload_app(name, upload_data, metadata=None, config=None):
     """Request a new upload to be created for a given upload_id."""
     upload_url = get_upload_url(name)
 
     result = {'success': False, 'errors': [],
               'application_url': '', 'revision': None}
 
-    session = get_oauth_session()
+    session = get_oauth_session(config)
     if session is None:
         result['errors'] = ['No valid credentials found.']
         return result