Merge lp:~ricardokirkner/click-toolbelt/split-store-api-namespace into lp:click-toolbelt

[Ricardo Kirkner]

split store api into standalone namespace for easier vendoring

[Fabián Ezequiel Gallina (fgallina)]

LGTM. Chat for reference:

2016-01-08 09:16 <pindonga> hi, need some advise whether to do a refactor or
                            not in click-toolbelt
2016-01-08 09:16 <pindonga> if anyone cares for a review
2016-01-08 09:17 <pindonga> https://code.launchpad.net/~ricardokirkner/click-toolbelt/split-store-api-namespace/+merge/281986
2016-01-08 09:17 <pindonga> basically... I started this work when it seemed
                            we couldn't snapcraft to use click-toolbelt as a
                            deb dependency
2016-01-08 09:18 <pindonga> the idea was to extract the shared bits into a
                            separate namespace so that the files could be
                            copied straight into snapcraft (for ease of
                            maintainability)
2016-01-08 09:18 <pindonga> now it looks like we might be able to package
                            click-toolbelt soon-ish
2016-01-08 09:18 <pindonga> so this refactor is not necessary anymore
2016-01-08 09:18 <pindonga> but maybe it's still worth doing
2016-01-08 09:23 <pedronis> pindonga: ultimately it still makes sense to
                            merge click-toolbelt into snapscraft (without
                            click bits), no?
2016-01-08 09:24 <pindonga> pedronis, in the long term, yes
2016-01-08 09:24 <pindonga> the q is how to best keep both alive until we
                            sunset click-toolbelt
2016-01-08 09:27 <pedronis> this looks right long term, even if you use
                            click-toolbelt as dep, later you remove
                            click-toolbet and put storeapi into snapcraft or
                            make a storeapi package instead if we have other
                            usages
2016-01-08 09:27 <pedronis> and code in snapcraft talks about things that
                            make sense to it
2016-01-08 09:27 [fgallina reads]
2016-01-08 09:31 <fgallina> pindonga: I think indeed this separation makes
                            sense, especially with latest comments by
                            pedronis.

review: Approve

[Joe Talbott (joetalbott)]

Could you use 'bzr mv' to get a less verbose patch?

[Ricardo Kirkner (ricardokirkner)]

Superseded by https://code.launchpad.net/~ricardokirkner/click-toolbelt/split-store-api-namespace-take-2/+merge/282001 which used bzr mv instead of add+rm to reduce diff size and preserve history.

review: Disapprove

Unmerged revisions

50. By Ricardo Kirkner on 2016-01-07

split store api into standalone namespace for easier vendoring

=== modified file 'Makefile'
--- Makefile	2014-02-24 12:43:21 +0000
+++ Makefile	2016-01-08 11:50:10 +0000
@@ -22,5 +22,5 @@
 coverage:
 	@coverage erase
 	@coverage run --branch setup.py test
-	@coverage report --include='click_toolbelt/*' -m
+	@coverage report --include='click_toolbelt/*,storeapi/*' -m
 

=== removed directory 'click_toolbelt/api'
=== removed file 'click_toolbelt/api/__init__.py'
--- click_toolbelt/api/__init__.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/api/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-
-from .channels import get_channels, update_channels  # noqa
-from .info import get_info  # noqa
-from ._login import login  # noqa
-from ._upload import upload  # noqa

=== removed file 'click_toolbelt/api/_login.py'
--- click_toolbelt/api/_login.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/api/_login.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-import os
-
-from ssoclient.v2 import (
-    ApiException,
-    UnexpectedApiError,
-    V2ApiClient,
-)
-
-from click_toolbelt.constants import (
-    CLICK_TOOLBELT_PROJECT_NAME,
-    UBUNTU_SSO_API_ROOT_URL,
-)
-
-
-def login(email, password, otp=None, token_name=CLICK_TOOLBELT_PROJECT_NAME):
-    """Log in via the Ubuntu One SSO API.
-
-    If successful, returns the oauth token data.
-    """
-    result = {
-        'success': False,
-        'body': None,
-    }
-
-    api_endpoint = os.environ.get(
-        'UBUNTU_SSO_API_ROOT_URL', UBUNTU_SSO_API_ROOT_URL)
-    client = V2ApiClient(endpoint=api_endpoint)
-    data = {
-        'email': email,
-        'password': password,
-        'token_name': token_name,
-    }
-    if otp is not None:
-        data['otp'] = otp
-    try:
-        response = client.login(data=data)
-        result['body'] = response
-        result['success'] = True
-    except ApiException as err:
-        result['body'] = err.body
-    except UnexpectedApiError as err:
-        result['body'] = err.json_body
-    return result

=== removed file 'click_toolbelt/api/_upload.py'
--- click_toolbelt/api/_upload.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/api/_upload.py	1970-01-01 00:00:00 +0000
@@ -1,264 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-import json
-import logging
-import os
-import re
-
-from click_toolbelt.api.common import get_oauth_session
-from click_toolbelt.common import (
-    is_scan_completed,
-    retry,
-)
-from click_toolbelt.compat import open, quote_plus, urljoin
-from click_toolbelt.constants import (
-    CLICK_UPDOWN_UPLOAD_URL,
-    MYAPPS_API_ROOT_URL,
-    SCAN_STATUS_POLL_DELAY,
-    SCAN_STATUS_POLL_RETRIES,
-)
-
-
-logger = logging.getLogger(__name__)
-
-
-def upload(binary_filename, metadata_filename='', metadata=None):
-    """Create a new upload based on a click/snap package."""
-
-    # validate package filename
-    pattern = (r'(.*/)?(?P<name>[\w\-_\.]+)_'
-               '(?P<version>[\d\.]+)_(?P<arch>\w+)\.(click|snap)')
-    match = re.match(pattern, binary_filename)
-    if not match:
-        logger.info('Invalid package filename.')
-        return
-    name = match.groupdict()['name']
-
-    logger.info('Uploading files...')
-    data = upload_files(binary_filename)
-    success = data.get('success', False)
-    errors = data.get('errors', [])
-    if not success:
-        logger.info('Upload failed:\n\n%s\n', '\n'.join(errors))
-        return False
-
-    logger.info('Uploading new version...')
-    meta = read_metadata(metadata_filename)
-    meta.update(metadata or {})
-    result = upload_app(name, data, metadata=meta)
-    success = result.get('success', False)
-    errors = result.get('errors', [])
-    app_url = result.get('application_url', '')
-    revision = result.get('revision')
-
-    if success:
-        logger.info('Application uploaded successfully.')
-        if revision:
-            logger.info('Uploaded as revision %s.', revision)
-    else:
-        logger.info('Upload did not complete.')
-
-    if errors:
-        logger.info('Some errors were detected:\n\n%s\n\n',
-                      '\n'.join(errors))
-
-    if app_url:
-        logger.info('Please check out the application at: %s.\n',
-                      app_url)
-
-    return success
-
-
-def upload_files(binary_filename):
-    """Upload a binary file to the Store.
-
-    Submit a file to the click-updown service and return the
-    corresponding upload_id.
-    """
-    updown_url = os.environ.get('CLICK_UPDOWN_UPLOAD_URL',
-                                CLICK_UPDOWN_UPLOAD_URL)
-    unscanned_upload_url = urljoin(updown_url, 'unscanned-upload/')
-    files = {'binary': open(binary_filename, 'rb')}
-
-    result = {'success': False, 'errors': []}
-
-    session = get_oauth_session()
-    if session is None:
-        result['errors'] = ['No valid credentials found.']
-        return result
-
-    try:
-        response = session.post(
-            unscanned_upload_url,
-            files=files)
-        if response.ok:
-            response_data = response.json()
-            result.update({
-                'success': response_data.get('successful', True),
-                'upload_id': response_data['upload_id'],
-                'binary_filesize': os.path.getsize(binary_filename),
-                'source_uploaded': 'source' in files,
-            })
-        else:
-            logger.error(
-                'There was an error uploading the package.\n'
-                'Reason: %s\n'
-                'Text: %s',
-                response.reason, response.text)
-            result['errors'] = [response.text]
-    except Exception as err:
-        logger.exception(
-            'An unexpected error was found while uploading files.')
-        result['errors'] = [str(err)]
-    finally:
-        # make sure to close any open files used for request
-        for fd in files.values():
-            fd.close()
-
-    return result
-
-
-def read_metadata(metadata_filename):
-    """Return a dictionary of metadata as read from a json file."""
-    if metadata_filename:
-        with open(metadata_filename, 'r') as metadata_file:
-            # file is automatically closed by context manager
-            metadata = json.load(metadata_file)
-    else:
-        metadata = {}
-
-    return metadata
-
-
-def upload_app(name, upload_data, metadata=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()
-    if session is None:
-        result['errors'] = ['No valid credentials found.']
-        return result
-
-    if metadata is None:
-        metadata = {}
-
-    try:
-        data = get_post_data(upload_data, metadata=metadata)
-        files = get_post_files(metadata=metadata)
-
-        response = session.post(upload_url, data=data, files=files)
-        if response.ok:
-            response_data = response.json()
-            status_url = response_data['status_url']
-            logger.info('Package submitted to %s', upload_url)
-            logger.info('Checking package status...')
-            completed, data = get_scan_data(session, status_url)
-            if completed:
-                logger.info('Package scan completed.')
-                message = data.get('message', '')
-                if not message:
-                    result['success'] = True
-                    result['revision'] = data.get('revision')
-                else:
-                    result['errors'] = [message]
-            else:
-                result['errors'] = [
-                    'Package scan took too long.',
-                ]
-                status_web_url = response_data.get('web_status_url')
-                if status_web_url:
-                    result['errors'].append(
-                        'Please check the status later at: %s.' % (
-                            status_web_url),
-                    )
-            result['application_url'] = data.get('application_url', '')
-        else:
-            logger.error(
-                'There was an error uploading the application.\n'
-                'Reason: %s\n'
-                'Text: %s',
-                response.reason, response.text)
-            result['errors'] = [response.text]
-    except Exception as err:
-        logger.exception(
-            'There was an error uploading the application.')
-        result['errors'] = [str(err)]
-    finally:
-        # make sure to close any open files used for request
-        for fname, fd in files:
-            fd.close()
-
-    return result
-
-
-def get_upload_url(name):
-    """Return the url of the uploaded package."""
-    myapps_api_url = os.environ.get('MYAPPS_API_ROOT_URL',
-                                    MYAPPS_API_ROOT_URL)
-    upload_url = urljoin(myapps_api_url, 'click-package-upload/')
-    upload_url += "%s/" % quote_plus(name)
-    return upload_url
-
-
-def get_post_data(upload_data, metadata=None):
-    """Return the data to be posted in order to create the upload."""
-    data = {
-        'updown_id': upload_data['upload_id'],
-        'binary_filesize': upload_data['binary_filesize'],
-        'source_uploaded': upload_data['source_uploaded'],
-    }
-    data.update({
-        key: value
-        for (key, value) in metadata.items()
-        if key not in (
-            # make sure not to override upload_id, binary_filesize and
-            # source_uploaded
-            'upload_id', 'binary_filesize', 'source_uploaded',
-            # skip files as they will be added to the files argument
-            'icon_256', 'icon', 'screenshots',
-        )
-    })
-    return data
-
-
-def get_post_files(metadata=None):
-    """Return data about files to upload during the package upload request."""
-    files = []
-
-    icon = metadata.get('icon', metadata.get('icon_256', ''))
-    if icon:
-        icon_file = open(icon, 'rb')
-        files.append(('icon_256', icon_file))
-
-    screenshots = metadata.get('screenshots', [])
-    for screenshot in screenshots:
-        screenshot_file = open(screenshot, 'rb')
-        files.append(('screenshots', screenshot_file))
-
-    return files
-
-
-def get_scan_data(session, status_url):
-    """Return metadata about the state of the upload scan process."""
-    # initial retry after 5 seconds
-    # linear backoff after that
-    # abort after 5 retries
-    @retry(terminator=is_scan_completed,
-           retries=SCAN_STATUS_POLL_RETRIES,
-           delay=SCAN_STATUS_POLL_DELAY,
-           backoff=1, logger=logger)
-    def get_status():
-        return session.get(status_url)
-
-    response, aborted = get_status()
-
-    completed = False
-    data = {}
-    if not aborted:
-        completed = is_scan_completed(response)
-        data = response.json()
-    return completed, data

=== removed file 'click_toolbelt/api/channels.py'
--- click_toolbelt/api/channels.py	2015-12-09 19:10:19 +0000
+++ click_toolbelt/api/channels.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-
-from click_toolbelt.api.common import myapps_api_call
-
-
-def get_channels(session, package_name):
-    """Get current channels config for package through API."""
-    channels_endpoint = 'package-channels/%s/' % package_name
-    return myapps_api_call(channels_endpoint, session=session)
-
-
-def update_channels(session, package_name, data):
-    """Update current channels config for package through API."""
-    channels_endpoint = 'package-channels/%s/' % package_name
-    result =  myapps_api_call(channels_endpoint, method='POST',
-                              data=data, session=session)
-    if result['success']:
-        result['errors'] = result['data']['errors']
-        result['data'] = result['data']['channels']
-    return result

=== removed file 'click_toolbelt/api/common.py'
--- click_toolbelt/api/common.py	2015-12-11 20:03:40 +0000
+++ click_toolbelt/api/common.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-import json
-import os
-
-import requests
-from requests_oauthlib import OAuth1Session
-
-from click_toolbelt.compat import urljoin
-from click_toolbelt.config import load_config
-from click_toolbelt.constants import MYAPPS_API_ROOT_URL
-
-
-def get_oauth_session():
-    """Return a client configured to allow oauth signed requests."""
-    config = load_config()
-    try:
-        session = OAuth1Session(
-            config['consumer_key'],
-            client_secret=config['consumer_secret'],
-            resource_owner_key=config['token_key'],
-            resource_owner_secret=config['token_secret'],
-            signature_method='PLAINTEXT',
-        )
-    except KeyError:
-        session = None
-    return session
-
-
-def myapps_api_call(path, session=None, method='GET', data=None):
-    """Issue a request for a particular endpoint of the MyApps API."""
-    result = {'success': False, 'errors': [], 'data': None}
-    if session is not None:
-        client = session
-    else:
-        client = requests
-
-    root_url = os.environ.get('MYAPPS_API_ROOT_URL', MYAPPS_API_ROOT_URL)
-    url = urljoin(root_url, path)
-    if method == 'GET':
-        response = client.get(url)
-    elif method == 'POST':
-        response = client.post(url, data=data and json.dumps(data) or None,
-                               headers={'Content-Type': 'application/json'})
-    else:
-        raise ValueError('Method {} not supported'.format(method))
-
-    if response.ok:
-        result['success'] = True
-        result['data'] = response.json()
-    else:
-        result['errors'] = [response.text]
-    return result

=== removed file 'click_toolbelt/api/info.py'
--- click_toolbelt/api/info.py	2015-12-09 19:10:19 +0000
+++ click_toolbelt/api/info.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-
-from click_toolbelt.api.common import myapps_api_call
-
-
-def get_info():
-    """Return information about the MyApps API.
-
-    Returned data contains information about:
-    - version
-    - department
-    - license
-    - country
-    - channel
-    """
-    return myapps_api_call('')

=== modified file 'click_toolbelt/channels.py'
--- click_toolbelt/channels.py	2015-12-22 15:28:53 +0000
+++ click_toolbelt/channels.py	2016-01-08 11:50:10 +0000
@@ -4,11 +4,11 @@
 import json
 import logging
 
-from click_toolbelt.api.channels import get_channels, update_channels
 from click_toolbelt.common import (
     Command,
     CommandError,
 )
+from storeapi.channels import get_channels, update_channels
 
 
 class Channels(Command):

=== modified file 'click_toolbelt/common.py'
--- click_toolbelt/common.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/common.py	2016-01-08 11:50:10 +0000
@@ -1,12 +1,11 @@
 # Copyright 2015 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
 from __future__ import absolute_import, unicode_literals
-import time
-from functools import wraps
 
 import cliff.command
 
 from click_toolbelt.config import clear_config, load_config, save_config
+from storeapi.common import get_oauth_session
 
 
 class CommandError(Exception):
@@ -29,73 +28,8 @@
 
     def get_oauth_session(self):
         """Return a client configured to allow oauth signed requests."""
-        # import here to avoid circular import
-        from click_toolbelt.api.common import get_oauth_session
-        return get_oauth_session()
+        config = load_config()
+        return get_oauth_session(config)
 
     def take_action(self, parsed_args):
         pass  # pragma: no cover
-
-
-def is_scan_completed(response):
-    """Return True if the response indicates the scan process completed."""
-    if response.ok:
-        return response.json().get('completed', False)
-    return False
-
-
-def retry(terminator=None, retries=3, delay=3, backoff=2, logger=None):
-    """Decorate a function to automatically retry calling it on failure.
-
-    Arguments:
-        - terminator: this should be a callable that returns a boolean;
-          it is used to determine if the function call was successful
-          and the retry loop should be stopped
-        - retries: an integer specifying the maximum number of retries
-        - delay: initial number of seconds to wait for the first retry
-        - backoff: exponential factor to use to adapt the delay between
-          subsequent retries
-        - logger: logging.Logger instance to use for logging
-
-    The decorated function will return as soon as any of the following
-    conditions are met:
-
-        1. terminator evaluates function output as True
-        2. there are no more retries left
-
-    If the terminator callable is not provided, the function will be called
-    exactly once and will not be retried.
-
-    """
-    def decorated(func):
-        if retries != int(retries) or retries < 0:
-            raise ValueError(
-                'retries value must be a positive integer or zero')
-        if delay < 0:
-            raise ValueError('delay value must be positive')
-
-        if backoff != int(backoff) or backoff < 1:
-            raise ValueError('backoff value must be a positive integer')
-
-        @wraps(func)
-        def wrapped(*args, **kwargs):
-            retries_left, current_delay = retries, delay
-
-            result = func(*args, **kwargs)
-            if terminator is not None:
-                while not terminator(result) and retries_left > 0:
-                    msg = "... retrying in %d seconds" % current_delay
-                    if logger:
-                        logger.warning(msg)
-
-                    # sleep
-                    time.sleep(current_delay)
-                    retries_left -= 1
-                    current_delay *= backoff
-
-                    # retry
-                    result = func(*args, **kwargs)
-            return result, retries_left == 0
-
-        return wrapped
-    return decorated

=== modified file 'click_toolbelt/info.py'
--- click_toolbelt/info.py	2015-12-09 12:59:24 +0000
+++ click_toolbelt/info.py	2016-01-08 11:50:10 +0000
@@ -6,8 +6,8 @@
 
 from cliff.command import Command
 
-from click_toolbelt.api.info import get_info
 from click_toolbelt.common import CommandError
+from storeapi.info import get_info
 
 
 class Info(Command):

=== modified file 'click_toolbelt/login.py'
--- click_toolbelt/login.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/login.py	2016-01-08 11:50:10 +0000
@@ -4,7 +4,6 @@
 from __future__ import absolute_import, unicode_literals
 import logging
 
-from click_toolbelt.api import login
 from click_toolbelt.common import (
     Command,
     CommandError,
@@ -12,6 +11,7 @@
 from click_toolbelt.constants import (
     CLICK_TOOLBELT_PROJECT_NAME,
 )
+from storeapi import login
 
 
 class Login(Command):

=== removed directory 'click_toolbelt/tests/api'
=== removed file 'click_toolbelt/tests/api/__init__.py'
--- click_toolbelt/tests/api/__init__.py	2015-12-09 14:06:23 +0000
+++ click_toolbelt/tests/api/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).

=== removed file 'click_toolbelt/tests/api/test_channels.py'
--- click_toolbelt/tests/api/test_channels.py	2015-12-21 16:05:53 +0000
+++ click_toolbelt/tests/api/test_channels.py	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-import json
-
-from mock import patch
-
-from click_toolbelt.api.channels import get_channels, update_channels
-from click_toolbelt.tests.test_config import ConfigTestCase
-
-
-class ChannelsAPITestCase(ConfigTestCase):
-
-    def setUp(self):
-        super(ChannelsAPITestCase, self).setUp()
-
-        # setup patches
-        oauth_session = 'click_toolbelt.api.common.get_oauth_session'
-        patcher = patch(oauth_session)
-        self.mock_get_oauth_session = patcher.start()
-        self.mock_session = self.mock_get_oauth_session.return_value
-        self.addCleanup(patcher.stop)
-
-        self.mock_get = self.mock_session.get
-        self.mock_post = self.mock_session.post
-
-        self.channels_data = [
-            {'channel': 'stable', 'current': {'revision': 2, 'version': '1'}},
-            {'channel': 'beta', 'current': {'revision': 4, 'version': '1.5'}},
-            {'channel': 'edge', 'current': None},
-        ]
-
-    def set_channels_get_success_response(self):
-        mock_response = self.mock_get.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = self.channels_data
-
-    def set_channels_get_error_response(self, error_msg):
-        mock_response = self.mock_get.return_value
-        mock_response.ok = False
-        mock_response.text = error_msg
-
-    def set_channels_post_success_response(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'success': True, 'errors': [], 'channels': self.channels_data
-        }
-
-    def set_channels_post_failed_response(self, error_msg):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'success': True, 'errors': [error_msg],
-            'channels': self.channels_data
-        }
-
-    def set_channels_post_error_response(self, error_msg):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = False
-        mock_response.text = error_msg
-
-    def test_get_channels(self):
-        self.set_channels_get_success_response()
-
-        data = get_channels(self.mock_session, 'package.name')
-
-        expected = {
-            'success': True,
-            'errors': [],
-            'data': self.channels_data,
-        }
-        self.assertEqual(data, expected)
-
-    def test_get_channels_with_error_response(self):
-        error_msg = 'some error'
-        self.set_channels_get_error_response(error_msg)
-
-        data = get_channels(self.mock_session, 'package.name')
-
-        expected = {
-            'success': False,
-            'errors': [error_msg],
-            'data': None,
-        }
-        self.assertEqual(data, expected)
-
-    def test_get_channels_uses_environment_variables(self):
-        with patch('click_toolbelt.api.common.os.environ',
-                   {'MYAPPS_API_ROOT_URL': 'http://example.com'}):
-            get_channels(self.mock_session, 'package.name')
-        self.mock_get.assert_called_once_with(
-            'http://example.com/package-channels/package.name/')
-
-    def test_update_channels(self):
-        self.set_channels_post_success_response()
-
-        data = update_channels(
-            self.mock_session, 'package.name', {'stable': 2})
-
-        expected = {
-            'success': True,
-            'errors': [],
-            'data': self.channels_data,
-        }
-        self.assertEqual(data, expected)
-
-    def test_update_channels_with_error_response(self):
-        error_msg = 'some error'
-        self.set_channels_post_error_response(error_msg)
-
-        data = update_channels(
-            self.mock_session, 'package.name', {'stable': 2})
-
-        expected = {
-            'success': False,
-            'errors': [error_msg],
-            'data': None,
-        }
-        self.assertEqual(data, expected)
-
-    def test_update_channels_with_failed_response(self):
-        error_msg = 'some error'
-        self.set_channels_post_failed_response(error_msg)
-
-        data = update_channels(
-            self.mock_session, 'package.name', {'stable': 2})
-
-        expected = {
-            'success': True,
-            'errors': [error_msg],
-            'data': self.channels_data,
-        }
-        self.assertEqual(data, expected)
-
-    def test_update_channels_uses_environment_variables(self):
-        with patch('click_toolbelt.api.common.os.environ',
-                   {'MYAPPS_API_ROOT_URL': 'http://example.com'}):
-            update_channels(
-                self.mock_session, 'package.name', {'stable': 2})
-        self.mock_post.assert_called_once_with(
-            'http://example.com/package-channels/package.name/',
-            data=json.dumps({'stable': 2}),
-            headers={'Content-Type': 'application/json'})

=== removed file 'click_toolbelt/tests/api/test_common.py'
--- click_toolbelt/tests/api/test_common.py	2015-12-11 20:03:40 +0000
+++ click_toolbelt/tests/api/test_common.py	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-import json
-from unittest import TestCase
-
-import responses
-from mock import Mock, patch
-from requests_oauthlib import OAuth1Session
-
-from click_toolbelt.api.common import get_oauth_session, myapps_api_call
-
-
-class GetOAuthSessionTestCase(TestCase):
-
-    def setUp(self):
-        super(GetOAuthSessionTestCase, self).setUp()
-        patcher = patch(
-            'click_toolbelt.api.common.load_config')
-        self.mock_load_config = patcher.start()
-        self.addCleanup(patcher.stop)
-
-    def test_get_oauth_session_when_no_config(self):
-        self.mock_load_config.return_value = {}
-        session = get_oauth_session()
-        self.assertIsNone(session)
-
-    def test_get_oauth_session_when_partial_config(self):
-        self.mock_load_config.return_value = {
-            'consumer_key': 'consumer-key',
-            'consumer_secret': 'consumer-secret',
-        }
-        session = get_oauth_session()
-        self.assertIsNone(session)
-
-    def test_get_oauth_session(self):
-        self.mock_load_config.return_value = {
-            'consumer_key': 'consumer-key',
-            'consumer_secret': 'consumer-secret',
-            'token_key': 'token-key',
-            'token_secret': 'token-secret',
-        }
-        session = get_oauth_session()
-        self.assertIsInstance(session, OAuth1Session)
-        self.assertEqual(session.auth.client.client_key, 'consumer-key')
-        self.assertEqual(session.auth.client.client_secret, 'consumer-secret')
-        self.assertEqual(session.auth.client.resource_owner_key, 'token-key')
-        self.assertEqual(session.auth.client.resource_owner_secret,
-                         'token-secret')
-
-
-class ApiCallTestCase(TestCase):
-
-    def setUp(self):
-        super(ApiCallTestCase, self).setUp()
-        p = patch('click_toolbelt.api.common.os')
-        mock_os = p.start()
-        self.addCleanup(p.stop)
-        mock_os.environ = {'MYAPPS_API_ROOT_URL': 'http://example.com'}
-
-    @responses.activate
-    def test_get_success(self):
-        response_data = {'response': 'value'}
-        responses.add(responses.GET, 'http://example.com/path',
-                      json=response_data)
-
-        result = myapps_api_call('/path')
-        self.assertEqual(result, {
-            'success': True,
-            'data': response_data,
-            'errors': [],
-        })
-
-    @responses.activate
-    def test_get_error(self):
-        response_data = {'response': 'error'}
-        responses.add(responses.GET, 'http://example.com/path',
-                      json=response_data, status=500)
-
-        result = myapps_api_call('/path')
-        self.assertEqual(result, {
-            'success': False,
-            'data': None,
-            'errors': [json.dumps(response_data)],
-        })
-
-    @responses.activate
-    def test_post_success(self):
-        response_data = {'response': 'value'}
-        responses.add(responses.POST, 'http://example.com/path',
-                      json=response_data)
-
-        result = myapps_api_call('/path', method='POST')
-        self.assertEqual(result, {
-            'success': True,
-            'data': response_data,
-            'errors': [],
-        })
-
-    @responses.activate
-    def test_post_error(self):
-        response_data = {'response': 'value'}
-        responses.add(responses.POST, 'http://example.com/path',
-                      json=response_data, status=500)
-
-        result = myapps_api_call('/path', method='POST')
-        self.assertEqual(result, {
-            'success': False,
-            'data': None,
-            'errors': [json.dumps(response_data)],
-        })
-
-    def test_unsupported_method(self):
-        self.assertRaises(ValueError, myapps_api_call, '/path', method='FOO')
-
-    def test_get_with_session(self):
-        session = Mock()
-        myapps_api_call('/path', session=session)
-        session.get.assert_called_once_with('http://example.com/path')
-
-    def test_post_with_session(self):
-        session = Mock()
-        myapps_api_call('/path', method='POST', session=session)
-        session.post.assert_called_once_with(
-            'http://example.com/path',
-            data=None, headers={'Content-Type': 'application/json'})
-
-    @responses.activate
-    def test_post_with_data(self):
-        response_data = {'response': 'value'}
-        responses.add(responses.POST, 'http://example.com/path',
-                      json=response_data)
-
-        result = myapps_api_call('/path', method='POST', data={'request': 'value'})
-        self.assertEqual(result, {
-            'success': True,
-            'data': response_data,
-            'errors': [],
-        })
-        self.assertEqual(len(responses.calls), 1)
-        self.assertEqual(responses.calls[0].request.headers['Content-Type'],
-                         'application/json')
-        self.assertEqual(responses.calls[0].request.body,
-                         json.dumps({'request': 'value'}))

=== removed file 'click_toolbelt/tests/api/test_info.py'
--- click_toolbelt/tests/api/test_info.py	2015-12-09 19:10:19 +0000
+++ click_toolbelt/tests/api/test_info.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-from unittest import TestCase
-
-from mock import patch
-
-from click_toolbelt.api.info import get_info
-
-
-class InfoAPITestCase(TestCase):
-
-    def setUp(self):
-        super(InfoAPITestCase, self).setUp()
-
-        patcher = patch('click_toolbelt.api.common.requests.get')
-        self.mock_get = patcher.start()
-        self.mock_response = self.mock_get.return_value
-        self.addCleanup(patcher.stop)
-
-    def test_get_info(self):
-        expected = {
-            'success': True,
-            'errors': [],
-            'data': {'version': 1},
-        }
-        self.mock_response.ok = True
-        self.mock_response.json.return_value = {'version': 1}
-        data = get_info()
-        self.assertEqual(data, expected)
-
-    def test_get_info_with_error_response(self):
-        expected = {
-            'success': False,
-            'errors': ['some error'],
-            'data': None,
-        }
-        self.mock_response.ok = False
-        self.mock_response.text = 'some error'
-        data = get_info()
-        self.assertEqual(data, expected)
-
-    def test_get_info_uses_environment_variables(self):
-        with patch('click_toolbelt.api.common.os.environ',
-                   {'MYAPPS_API_ROOT_URL': 'http://example.com'}):
-            get_info()
-        self.mock_get.assert_called_once_with('http://example.com')

=== removed file 'click_toolbelt/tests/api/test_login.py'
--- click_toolbelt/tests/api/test_login.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/tests/api/test_login.py	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-import json
-from unittest import TestCase
-
-from mock import patch
-from requests import Response
-
-from click_toolbelt.api._login import login
-from click_toolbelt.constants import (
-    CLICK_TOOLBELT_PROJECT_NAME,
-    UBUNTU_SSO_API_ROOT_URL,
-)
-
-
-class LoginAPITestCase(TestCase):
-
-    def setUp(self):
-        super(LoginAPITestCase, self).setUp()
-        self.email = '[e-mail]'
-        self.password = 'password'
-
-        # setup patches
-        mock_environ = {
-            'UBUNTU_SSO_API_ROOT_URL': UBUNTU_SSO_API_ROOT_URL,
-        }
-        patcher = patch('click_toolbelt.api._login.os.environ', mock_environ)
-        patcher.start()
-        self.addCleanup(patcher.stop)
-
-        patcher = patch('ssoclient.v2.http.requests.Session.request')
-        self.mock_request = patcher.start()
-        self.addCleanup(patcher.stop)
-        self.token_data = {
-            'consumer_key': 'consumer-key',
-            'consumer_secret': 'consumer-secret',
-            'token_key': 'token-key',
-            'token_secret': 'token-secret',
-        }
-        response = self.make_response(status_code=201, reason='CREATED',
-                                      data=self.token_data)
-        self.mock_request.return_value = response
-
-    def make_response(self, status_code=200, reason='OK', data=None):
-        data = data or {}
-        response = Response()
-        response.status_code = status_code
-        response.reason = reason
-        response._content = json.dumps(data).encode('utf-8')
-        return response
-
-    def assert_login_request(self, otp=None,
-                             token_name=CLICK_TOOLBELT_PROJECT_NAME):
-        data = {
-            'email': self.email,
-            'password': self.password,
-            'token_name': token_name
-        }
-        if otp is not None:
-            data['otp'] = otp
-        self.mock_request.assert_called_once_with(
-            'POST', UBUNTU_SSO_API_ROOT_URL + 'tokens/oauth',
-            data=json.dumps(data),
-            json=None, headers={'Content-Type': 'application/json'}
-        )
-
-    def test_login_successful(self):
-        result = login(self.email, self.password)
-        expected = {'success': True, 'body': self.token_data}
-        self.assertEqual(result, expected)
-
-    def test_default_token_name(self):
-        result = login(self.email, self.password)
-        expected = {'success': True, 'body': self.token_data}
-        self.assertEqual(result, expected)
-        self.assert_login_request()
-
-    def test_custom_token_name(self):
-        result = login(self.email, self.password, token_name='my-token')
-        expected = {'success': True, 'body': self.token_data}
-        self.assertEqual(result, expected)
-        self.assert_login_request(token_name='my-token')
-
-    def test_login_with_otp(self):
-        result = login(self.email, self.password, otp='123456')
-        expected = {'success': True, 'body': self.token_data}
-        self.assertEqual(result, expected)
-        self.assert_login_request(otp='123456')
-
-    def test_login_unsuccessful_api_exception(self):
-        error_data = {
-            'message': 'Error during login.',
-            'code': 'INVALID_CREDENTIALS',
-            'extra': {},
-        }
-        response = self.make_response(
-            status_code=401, reason='UNAUTHORISED', data=error_data)
-        self.mock_request.return_value = response
-
-        result = login(self.email, self.password)
-        expected = {'success': False, 'body': error_data}
-        self.assertEqual(result, expected)
-
-    def test_login_unsuccessful_unexpected_error(self):
-        error_data = {
-            'message': 'Error during login.',
-            'code': 'UNEXPECTED_ERROR_CODE',
-            'extra': {},
-        }
-        response = self.make_response(
-            status_code=401, reason='UNAUTHORISED', data=error_data)
-        self.mock_request.return_value = response
-
-        result = login(self.email, self.password)
-        expected = {'success': False, 'body': error_data}
-        self.assertEqual(result, expected)

=== removed file 'click_toolbelt/tests/api/test_upload.py'
--- click_toolbelt/tests/api/test_upload.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/tests/api/test_upload.py	1970-01-01 00:00:00 +0000
@@ -1,506 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU General Public License version 3 (see the file LICENSE).
-from __future__ import absolute_import, unicode_literals
-import json
-import os
-import tempfile
-
-from mock import ANY, patch
-from requests import Response
-
-from click_toolbelt.api._upload import (
-    get_upload_url,
-    upload_app,
-    upload_files,
-    upload,
-)
-from click_toolbelt.tests.test_config import (
-    ConfigTestCase,
-)
-
-
-class UploadBaseTestCase(ConfigTestCase):
-
-    def setUp(self):
-        super(UploadBaseTestCase, self).setUp()
-
-        # setup patches
-        name = 'click_toolbelt.api._upload.get_oauth_session'
-        patcher = patch(name)
-        self.mock_get_oauth_session = patcher.start()
-        self.addCleanup(patcher.stop)
-
-        self.mock_get = self.mock_get_oauth_session.return_value.get
-        self.mock_post = self.mock_get_oauth_session.return_value.post
-
-
-class UploadWithScanTestCase(UploadBaseTestCase):
-
-    def setUp(self):
-        super(UploadWithScanTestCase, self).setUp()
-        self.suffix = '_0.1_all.click'
-        self.binary_file = self.get_temporary_file(suffix=self.suffix)
-
-    def test_default_metadata(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'successful': True,
-            'upload_id': 'some-valid-upload-id',
-        }
-
-        upload(self.binary_file.name)
-
-        data = {
-            'updown_id': 'some-valid-upload-id',
-            'source_uploaded': False,
-            'binary_filesize': 0,
-        }
-        name = os.path.basename(self.binary_file.name).replace(self.suffix, '')
-        self.mock_post.assert_called_with(
-            get_upload_url(name), data=data, files=[])
-
-    def test_metadata_from_file(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'successful': True,
-            'upload_id': 'some-valid-upload-id',
-        }
-
-        with self.get_temporary_file() as metadata_file:
-            data = json.dumps({'name': 'from_file'})
-            metadata_file.write(data.encode('utf-8'))
-            metadata_file.flush()
-
-            upload(
-                self.binary_file.name, metadata_filename=metadata_file.name)
-
-        data = {
-            'updown_id': 'some-valid-upload-id',
-            'source_uploaded': False,
-            'binary_filesize': 0,
-            'name': 'from_file',
-        }
-        name = os.path.basename(self.binary_file.name).replace(self.suffix, '')
-        self.mock_post.assert_called_with(
-            get_upload_url(name), data=data, files=[])
-
-    def test_override_metadata(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'successful': True,
-            'upload_id': 'some-valid-upload-id',
-        }
-
-        upload(
-            self.binary_file.name, metadata={'name': 'overridden'})
-
-        data = {
-            'updown_id': 'some-valid-upload-id',
-            'source_uploaded': False,
-            'binary_filesize': 0,
-            'name': 'overridden',
-        }
-        name = os.path.basename(self.binary_file.name).replace(self.suffix, '')
-        self.mock_post.assert_called_with(
-            get_upload_url(name), data=data, files=[])
-
-
-class UploadFilesTestCase(UploadBaseTestCase):
-
-    def setUp(self):
-        super(UploadFilesTestCase, self).setUp()
-        self.binary_file = self.get_temporary_file(suffix='_0.1_all.click')
-
-    def test_upload_files(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'successful': True,
-            'upload_id': 'some-valid-upload-id',
-        }
-
-        response = upload_files(self.binary_file.name)
-        self.assertEqual(response, {
-            'success': True,
-            'errors': [],
-            'upload_id': 'some-valid-upload-id',
-            'binary_filesize': os.path.getsize(self.binary_file.name),
-            'source_uploaded': False,
-        })
-
-    def test_upload_files_uses_environment_variables(self):
-        with patch.dict(os.environ,
-                        CLICK_UPDOWN_UPLOAD_URL='http://example.com'):
-            upload_url = 'http://example.com/unscanned-upload/'
-            upload_files(self.binary_file.name)
-            self.mock_post.assert_called_once_with(
-                upload_url, files={'binary': ANY})
-
-    def test_upload_files_with_source_upload(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'successful': True,
-            'upload_id': 'some-valid-upload-id',
-        }
-
-        response = upload_files(self.binary_file.name)
-        self.assertEqual(response, {
-            'success': True,
-            'errors': [],
-            'upload_id': 'some-valid-upload-id',
-            'binary_filesize': os.path.getsize(self.binary_file.name),
-            'source_uploaded': False,
-        })
-
-    def test_upload_files_with_invalid_oauth_session(self):
-        self.mock_get_oauth_session.return_value = None
-        response = upload_files(self.binary_file.name)
-        self.assertEqual(response, {
-            'success': False,
-            'errors': ['No valid credentials found.'],
-        })
-        self.assertFalse(self.mock_post.called)
-
-    def test_upload_files_error_response(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = False
-        mock_response.reason = '500 INTERNAL SERVER ERROR'
-        mock_response.text = 'server failed'
-
-        response = upload_files(self.binary_file.name)
-        self.assertEqual(response, {
-            'success': False,
-            'errors': ['server failed'],
-        })
-
-    def test_upload_files_handle_malformed_response(self):
-        mock_response = self.mock_post.return_value
-        mock_response.json.return_value = {'successful': False}
-
-        response = upload_files(self.binary_file.name)
-        err = KeyError('upload_id')
-        self.assertEqual(response, {
-            'success': False,
-            'errors': [str(err)],
-        })
-
-
-class UploadAppTestCase(UploadBaseTestCase):
-
-    def setUp(self):
-        super(UploadAppTestCase, self).setUp()
-        self.data = {
-            'upload_id': 'some-valid-upload-id',
-            'binary_filesize': 123456,
-            'source_uploaded': False,
-        }
-        self.package_name = 'namespace.binary'
-
-        patcher = patch.multiple(
-            'click_toolbelt.api._upload',
-            SCAN_STATUS_POLL_DELAY=0.0001)
-        patcher.start()
-        self.addCleanup(patcher.stop)
-
-    def test_upload_app_with_invalid_oauth_session(self):
-        self.mock_get_oauth_session.return_value = None
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': False,
-            'errors': ['No valid credentials found.'],
-            'application_url': '',
-            'revision': None,
-        })
-
-    def test_upload_app_uses_environment_variables(self):
-        with patch.dict(os.environ,
-                        MYAPPS_API_ROOT_URL='http://example.com'):
-            upload_url = ("http://example.com/click-package-upload/%s/" %
-                          self.package_name)
-            data = {
-                'updown_id': self.data['upload_id'],
-                'binary_filesize': self.data['binary_filesize'],
-                'source_uploaded': self.data['source_uploaded'],
-            }
-            upload_app(self.package_name, self.data)
-            self.mock_post.assert_called_once_with(
-                upload_url, data=data, files=[])
-
-    def test_upload_app(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'success': True,
-            'status_url': 'http://example.com/status/'
-        }
-
-        mock_status_response = self.mock_get.return_value
-        mock_status_response.ok = True
-        mock_status_response.json.return_value = {
-            'completed': True,
-            'revision': 15,
-        }
-
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': True,
-            'errors': [],
-            'application_url': '',
-            'revision': 15,
-        })
-
-    def test_upload_app_error_response(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = False
-        mock_response.reason = '500 INTERNAL SERVER ERROR'
-        mock_response.text = 'server failure'
-
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': False,
-            'errors': ['server failure'],
-            'application_url': '',
-            'revision': None,
-        })
-
-    def test_upload_app_handle_malformed_response(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {}
-
-        response = upload_app(self.package_name, self.data)
-        err = KeyError('status_url')
-        self.assertEqual(response, {
-            'success': False,
-            'errors': [str(err)],
-            'application_url': '',
-            'revision': None,
-        })
-
-    def test_upload_app_with_errors_during_scan(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'success': True,
-            'status_url': 'http://example.com/status/'
-        }
-
-        mock_status_response = self.mock_get.return_value
-        mock_status_response.ok = True
-        mock_status_response.json.return_value = {
-            'completed': True,
-            'message': 'some error',
-            'application_url': 'http://example.com/myapp',
-        }
-
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': False,
-            'errors': ['some error'],
-            'application_url': 'http://example.com/myapp',
-            'revision': None,
-        })
-
-    def test_upload_app_poll_status(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.return_value = {
-            'success': True,
-            'status_url': 'http://example.com/status/'
-        }
-
-        response_not_completed = Response()
-        response_not_completed.status_code = 200
-        response_not_completed.encoding = 'utf-8'
-        response_not_completed._content = json.dumps(
-            {'completed': False, 'application_url': ''}).encode('utf-8')
-        response_completed = Response()
-        response_completed.status_code = 200
-        response_completed.encoding = 'utf-8'
-        response_completed._content = json.dumps(
-            {'completed': True, 'revision': 14,
-             'application_url': 'http://example.org'}).encode('utf-8')
-        self.mock_get.side_effect = [
-            response_not_completed,
-            response_not_completed,
-            response_completed,
-        ]
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': True,
-            'errors': [],
-            'application_url': 'http://example.org',
-            'revision': 14,
-        })
-        self.assertEqual(self.mock_get.call_count, 3)
-
-    def test_upload_app_ignore_non_ok_responses(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.return_value = {
-            'success': True,
-            'status_url': 'http://example.com/status/',
-        }
-
-        ok_response = Response()
-        ok_response.status_code = 200
-        ok_response.encoding = 'utf-8'
-        ok_response._content = json.dumps(
-            {'completed': True, 'revision': 14}).encode('utf-8')
-        nok_response = Response()
-        nok_response.status_code = 503
-
-        self.mock_get.side_effect = [nok_response, nok_response, ok_response]
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': True,
-            'errors': [],
-            'application_url': '',
-            'revision': 14,
-        })
-        self.assertEqual(self.mock_get.call_count, 3)
-
-    def test_upload_app_abort_polling(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'success': True,
-            'status_url': 'http://example.com/status/',
-            'web_status_url': 'http://example.com/status-web/',
-        }
-
-        mock_status_response = self.mock_get.return_value
-        mock_status_response.ok = True
-        mock_status_response.json.return_value = {
-            'completed': False
-        }
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': False,
-            'errors': [
-                'Package scan took too long.',
-                'Please check the status later at: '
-                'http://example.com/status-web/.',
-            ],
-            'application_url': '',
-            'revision': None,
-        })
-
-    def test_upload_app_abort_polling_without_web_status_url(self):
-        mock_response = self.mock_post.return_value
-        mock_response.ok = True
-        mock_response.json.return_value = {
-            'success': True,
-            'status_url': 'http://example.com/status/',
-        }
-
-        mock_status_response = self.mock_get.return_value
-        mock_status_response.ok = True
-        mock_status_response.json.return_value = {
-            'completed': False
-        }
-        response = upload_app(self.package_name, self.data)
-        self.assertEqual(response, {
-            'success': False,
-            'errors': [
-                'Package scan took too long.',
-            ],
-            'application_url': '',
-            'revision': None,
-        })
-
-    def test_upload_app_with_metadata(self):
-        upload_app(self.package_name, self.data, metadata={
-            'changelog': 'some changes', 'tagline': 'a tagline'})
-        self.mock_post.assert_called_once_with(
-            ANY,
-            data={
-                'updown_id': self.data['upload_id'],
-                'binary_filesize': self.data['binary_filesize'],
-                'source_uploaded': self.data['source_uploaded'],
-                'changelog': 'some changes',
-                'tagline': 'a tagline',
-            },
-            files=[],
-        )
-
-    def test_upload_app_ignore_special_attributes_in_metadata(self):
-        upload_app(
-            self.package_name,
-            self.data, metadata={
-                'changelog': 'some changes',
-                'tagline': 'a tagline',
-                'upload_id': 'my-own-id',
-                'binary_filesize': 0,
-                'source_uploaded': False,
-            })
-        self.mock_post.assert_called_once_with(
-            ANY,
-            data={
-                'updown_id': self.data['upload_id'],
-                'binary_filesize': self.data['binary_filesize'],
-                'source_uploaded': self.data['source_uploaded'],
-                'changelog': 'some changes',
-                'tagline': 'a tagline',
-            },
-            files=[],
-        )
-
-    @patch('click_toolbelt.api._upload.open')
-    def test_upload_app_with_icon(self, mock_open):
-        with tempfile.NamedTemporaryFile() as icon:
-            mock_open.return_value = icon
-
-            upload_app(
-                self.package_name, self.data,
-                metadata={
-                    'icon_256': icon.name,
-                }
-            )
-            self.mock_post.assert_called_once_with(
-                ANY,
-                data={
-                    'updown_id': self.data['upload_id'],
-                    'binary_filesize': self.data['binary_filesize'],
-                    'source_uploaded': self.data['source_uploaded'],
-                },
-                files=[
-                    ('icon_256', icon),
-                ],
-            )
-
-    @patch('click_toolbelt.api._upload.open')
-    def test_upload_app_with_screenshots(self, mock_open):
-        screenshot1 = tempfile.NamedTemporaryFile()
-        screenshot2 = tempfile.NamedTemporaryFile()
-        mock_open.side_effect = [screenshot1, screenshot2]
-
-        upload_app(
-            self.package_name, self.data,
-            metadata={
-                'screenshots': [screenshot1.name, screenshot2.name],
-            }
-        )
-        self.mock_post.assert_called_once_with(
-            ANY,
-            data={
-                'updown_id': self.data['upload_id'],
-                'binary_filesize': self.data['binary_filesize'],
-                'source_uploaded': self.data['source_uploaded'],
-            },
-            files=[
-                ('screenshots', screenshot1),
-                ('screenshots', screenshot2),
-            ],
-        )
-
-    def test_get_upload_url(self):
-        with patch.dict(os.environ,
-                        MYAPPS_API_ROOT_URL='http://example.com'):
-            upload_url = "http://example.com/click-package-upload/app.dev/"
-            url = get_upload_url('app.dev')
-            self.assertEqual(url, upload_url)

=== modified file 'click_toolbelt/tests/test_common.py'
--- click_toolbelt/tests/test_common.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/tests/test_common.py	2016-01-08 11:50:10 +0000
@@ -1,13 +1,11 @@
 # Copyright 2015 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
 from __future__ import absolute_import, unicode_literals
-from unittest import TestCase
 
-from mock import Mock, call, patch
+from mock import patch
 
 from click_toolbelt.common import (
     Command,
-    retry,
 )
 from click_toolbelt.tests.test_config import ConfigTestCase
 
@@ -21,7 +19,7 @@
         args = None
         self.command = self.command_class(app, args)
 
-        patcher = patch('click_toolbelt.api.common.get_oauth_session')
+        patcher = patch('click_toolbelt.common.get_oauth_session')
         self.mock_get_oauth_session = patcher.start()
         self.addCleanup(patcher.stop)
 
@@ -44,65 +42,3 @@
     def test_proxy_clear_config(self, mock_clear_config):
         self.command.clear_config()
         mock_clear_config.assert_called_once_with()
-
-
-class RetryDecoratorTestCase(TestCase):
-
-    def target(self, *args, **kwargs):
-        return dict(args=args, kwargs=kwargs)
-
-    def test_retry(self):
-        result, aborted = retry()(self.target)()
-        self.assertEqual(result, dict(args=(), kwargs={}))
-        self.assertEqual(aborted, False)
-
-    @patch('click_toolbelt.common.time.sleep')
-    def test_retry_small_backoff(self, mock_sleep):
-        mock_terminator = Mock()
-        mock_terminator.return_value = False
-
-        delay = 0.001
-        result, aborted = retry(mock_terminator, retries=2,
-                                delay=delay)(self.target)()
-
-        self.assertEqual(result, dict(args=(), kwargs={}))
-        self.assertEqual(aborted, True)
-        self.assertEqual(mock_terminator.call_count, 3)
-        self.assertEqual(mock_sleep.mock_calls, [
-            call(delay),
-            call(delay * 2),
-        ])
-
-    def test_retry_abort(self):
-        mock_terminator = Mock()
-        mock_terminator.return_value = False
-        mock_logger = Mock()
-
-        result, aborted = retry(mock_terminator, delay=0.001, backoff=1,
-                                logger=mock_logger)(self.target)()
-
-        self.assertEqual(result, dict(args=(), kwargs={}))
-        self.assertEqual(aborted, True)
-        self.assertEqual(mock_terminator.call_count, 4)
-        self.assertEqual(mock_logger.warning.call_count, 3)
-
-    def test_retry_with_invalid_retries(self):
-        for value in (0.1, -1):
-            with self.assertRaises(ValueError) as ctx:
-                retry(retries=value)(self.target)
-            self.assertEqual(
-                str(ctx.exception),
-                'retries value must be a positive integer or zero')
-
-    def test_retry_with_negative_delay(self):
-        with self.assertRaises(ValueError) as ctx:
-            retry(delay=-1)(self.target)
-        self.assertEqual(str(ctx.exception),
-                         'delay value must be positive')
-
-    def test_retry_with_invalid_backoff(self):
-        for value in (-1, 0, 0.1):
-            with self.assertRaises(ValueError) as ctx:
-                retry(backoff=value)(self.target)
-            self.assertEqual(str(ctx.exception),
-                             'backoff value must be a positive integer')

=== modified file 'click_toolbelt/tests/test_login.py'
--- click_toolbelt/tests/test_login.py	2015-12-22 15:28:53 +0000
+++ click_toolbelt/tests/test_login.py	2016-01-08 11:50:10 +0000
@@ -37,7 +37,7 @@
         mock_environ = {
             'UBUNTU_SSO_API_ROOT_URL': UBUNTU_SSO_API_ROOT_URL,
         }
-        patcher = patch('click_toolbelt.api._login.os.environ', mock_environ)
+        patcher = patch('storeapi._login.os.environ', mock_environ)
         patcher.start()
         self.addCleanup(patcher.stop)
 

=== modified file 'click_toolbelt/tests/test_upload.py'
--- click_toolbelt/tests/test_upload.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/tests/test_upload.py	2016-01-08 11:50:10 +0000
@@ -25,13 +25,13 @@
         self.mock_get = self.mock_get_oauth_session.return_value.get
         self.mock_post = self.mock_get_oauth_session.return_value.post
 
-        p = patch('click_toolbelt.api._upload.logger')
+        p = patch('storeapi._upload.logger')
         self.mock_logger = p.start()
         self.addCleanup(p.stop)
-        p = patch('click_toolbelt.api._upload.upload_files')
+        p = patch('storeapi._upload.upload_files')
         self.mock_upload_files = p.start()
         self.addCleanup(p.stop)
-        p = patch('click_toolbelt.api._upload.upload_app')
+        p = patch('storeapi._upload.upload_app')
         self.mock_upload_app = p.start()
         self.addCleanup(p.stop)
 

=== modified file 'click_toolbelt/toolbelt.py'
--- click_toolbelt/toolbelt.py	2015-12-21 18:09:53 +0000
+++ click_toolbelt/toolbelt.py	2016-01-08 11:50:10 +0000
@@ -1,6 +1,6 @@
+#!/usr/bin/env python
 # Copyright 2013 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
-#!/usr/bin/env python
 from __future__ import absolute_import, unicode_literals
 import sys
 

=== modified file 'click_toolbelt/upload.py'
--- click_toolbelt/upload.py	2015-12-21 18:41:57 +0000
+++ click_toolbelt/upload.py	2016-01-08 11:50:10 +0000
@@ -3,11 +3,11 @@
 from __future__ import absolute_import, unicode_literals
 import logging
 
-from click_toolbelt.api import upload
 from click_toolbelt.common import (
     Command,
     CommandError,
 )
+from storeapi import upload
 
 
 class Upload(Command):

=== modified file 'setup.py'
--- setup.py	2015-12-09 19:32:37 +0000
+++ setup.py	2016-01-08 11:50:10 +0000
@@ -67,7 +67,7 @@
 
     zip_safe=False,
 
-    test_suite='click_toolbelt.tests',
+    test_suite='tests',
     tests_require=[
         'mock',
         'responses',

=== added directory 'storeapi'
=== added file 'storeapi/__init__.py'
--- storeapi/__init__.py	1970-01-01 00:00:00 +0000
+++ storeapi/__init__.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,7 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+
+from .channels import get_channels, update_channels  # noqa
+from .info import get_info  # noqa
+from ._login import login  # noqa
+from ._upload import upload  # noqa

=== added file 'storeapi/_login.py'
--- storeapi/_login.py	1970-01-01 00:00:00 +0000
+++ storeapi/_login.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+import os
+
+from ssoclient.v2 import (
+    ApiException,
+    UnexpectedApiError,
+    V2ApiClient,
+)
+
+from storeapi.constants import (
+    UBUNTU_SSO_API_ROOT_URL,
+)
+
+
+def login(email, password, token_name, otp=None):
+    """Log in via the Ubuntu One SSO API.
+
+    If successful, returns the oauth token data.
+    """
+    result = {
+        'success': False,
+        'body': None,
+    }
+
+    api_endpoint = os.environ.get(
+        'UBUNTU_SSO_API_ROOT_URL', UBUNTU_SSO_API_ROOT_URL)
+    client = V2ApiClient(endpoint=api_endpoint)
+    data = {
+        'email': email,
+        'password': password,
+        'token_name': token_name,
+    }
+    if otp is not None:
+        data['otp'] = otp
+    try:
+        response = client.login(data=data)
+        result['body'] = response
+        result['success'] = True
+    except ApiException as err:
+        result['body'] = err.body
+    except UnexpectedApiError as err:
+        result['body'] = err.json_body
+    return result

=== added file 'storeapi/_upload.py'
--- storeapi/_upload.py	1970-01-01 00:00:00 +0000
+++ storeapi/_upload.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,264 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+import json
+import logging
+import os
+import re
+
+from storeapi.common import (
+    get_oauth_session,
+    is_scan_completed,
+    retry,
+)
+from storeapi.compat import open, quote_plus, urljoin
+from storeapi.constants import (
+    CLICK_UPDOWN_UPLOAD_URL,
+    MYAPPS_API_ROOT_URL,
+    SCAN_STATUS_POLL_DELAY,
+    SCAN_STATUS_POLL_RETRIES,
+)
+
+
+logger = logging.getLogger(__name__)
+
+
+def upload(binary_filename, metadata_filename='', metadata=None):
+    """Create a new upload based on a click/snap package."""
+
+    # validate package filename
+    pattern = (r'(.*/)?(?P<name>[\w\-_\.]+)_'
+               '(?P<version>[\d\.]+)_(?P<arch>\w+)\.(click|snap)')
+    match = re.match(pattern, binary_filename)
+    if not match:
+        logger.info('Invalid package filename.')
+        return
+    name = match.groupdict()['name']
+
+    logger.info('Uploading files...')
+    data = upload_files(binary_filename)
+    success = data.get('success', False)
+    errors = data.get('errors', [])
+    if not success:
+        logger.info('Upload failed:\n\n%s\n', '\n'.join(errors))
+        return False
+
+    logger.info('Uploading new version...')
+    meta = read_metadata(metadata_filename)
+    meta.update(metadata or {})
+    result = upload_app(name, data, metadata=meta)
+    success = result.get('success', False)
+    errors = result.get('errors', [])
+    app_url = result.get('application_url', '')
+    revision = result.get('revision')
+
+    if success:
+        logger.info('Application uploaded successfully.')
+        if revision:
+            logger.info('Uploaded as revision %s.', revision)
+    else:
+        logger.info('Upload did not complete.')
+
+    if errors:
+        logger.info('Some errors were detected:\n\n%s\n\n',
+                    '\n'.join(errors))
+
+    if app_url:
+        logger.info('Please check out the application at: %s.\n',
+                    app_url)
+
+    return success
+
+
+def upload_files(binary_filename):
+    """Upload a binary file to the Store.
+
+    Submit a file to the click-updown service and return the
+    corresponding upload_id.
+    """
+    updown_url = os.environ.get('CLICK_UPDOWN_UPLOAD_URL',
+                                CLICK_UPDOWN_UPLOAD_URL)
+    unscanned_upload_url = urljoin(updown_url, 'unscanned-upload/')
+    files = {'binary': open(binary_filename, 'rb')}
+
+    result = {'success': False, 'errors': []}
+
+    session = get_oauth_session()
+    if session is None:
+        result['errors'] = ['No valid credentials found.']
+        return result
+
+    try:
+        response = session.post(
+            unscanned_upload_url,
+            files=files)
+        if response.ok:
+            response_data = response.json()
+            result.update({
+                'success': response_data.get('successful', True),
+                'upload_id': response_data['upload_id'],
+                'binary_filesize': os.path.getsize(binary_filename),
+                'source_uploaded': 'source' in files,
+            })
+        else:
+            logger.error(
+                'There was an error uploading the package.\n'
+                'Reason: %s\n'
+                'Text: %s',
+                response.reason, response.text)
+            result['errors'] = [response.text]
+    except Exception as err:
+        logger.exception(
+            'An unexpected error was found while uploading files.')
+        result['errors'] = [str(err)]
+    finally:
+        # make sure to close any open files used for request
+        for fd in files.values():
+            fd.close()
+
+    return result
+
+
+def read_metadata(metadata_filename):
+    """Return a dictionary of metadata as read from a json file."""
+    if metadata_filename:
+        with open(metadata_filename, 'r') as metadata_file:
+            # file is automatically closed by context manager
+            metadata = json.load(metadata_file)
+    else:
+        metadata = {}
+
+    return metadata
+
+
+def upload_app(name, upload_data, metadata=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()
+    if session is None:
+        result['errors'] = ['No valid credentials found.']
+        return result
+
+    if metadata is None:
+        metadata = {}
+
+    try:
+        data = get_post_data(upload_data, metadata=metadata)
+        files = get_post_files(metadata=metadata)
+
+        response = session.post(upload_url, data=data, files=files)
+        if response.ok:
+            response_data = response.json()
+            status_url = response_data['status_url']
+            logger.info('Package submitted to %s', upload_url)
+            logger.info('Checking package status...')
+            completed, data = get_scan_data(session, status_url)
+            if completed:
+                logger.info('Package scan completed.')
+                message = data.get('message', '')
+                if not message:
+                    result['success'] = True
+                    result['revision'] = data.get('revision')
+                else:
+                    result['errors'] = [message]
+            else:
+                result['errors'] = [
+                    'Package scan took too long.',
+                ]
+                status_web_url = response_data.get('web_status_url')
+                if status_web_url:
+                    result['errors'].append(
+                        'Please check the status later at: %s.' % (
+                            status_web_url),
+                    )
+            result['application_url'] = data.get('application_url', '')
+        else:
+            logger.error(
+                'There was an error uploading the application.\n'
+                'Reason: %s\n'
+                'Text: %s',
+                response.reason, response.text)
+            result['errors'] = [response.text]
+    except Exception as err:
+        logger.exception(
+            'There was an error uploading the application.')
+        result['errors'] = [str(err)]
+    finally:
+        # make sure to close any open files used for request
+        for fname, fd in files:
+            fd.close()
+
+    return result
+
+
+def get_upload_url(name):
+    """Return the url of the uploaded package."""
+    myapps_api_url = os.environ.get('MYAPPS_API_ROOT_URL',
+                                    MYAPPS_API_ROOT_URL)
+    upload_url = urljoin(myapps_api_url, 'click-package-upload/')
+    upload_url += "%s/" % quote_plus(name)
+    return upload_url
+
+
+def get_post_data(upload_data, metadata=None):
+    """Return the data to be posted in order to create the upload."""
+    data = {
+        'updown_id': upload_data['upload_id'],
+        'binary_filesize': upload_data['binary_filesize'],
+        'source_uploaded': upload_data['source_uploaded'],
+    }
+    data.update({
+        key: value
+        for (key, value) in metadata.items()
+        if key not in (
+            # make sure not to override upload_id, binary_filesize and
+            # source_uploaded
+            'upload_id', 'binary_filesize', 'source_uploaded',
+            # skip files as they will be added to the files argument
+            'icon_256', 'icon', 'screenshots',
+        )
+    })
+    return data
+
+
+def get_post_files(metadata=None):
+    """Return data about files to upload during the package upload request."""
+    files = []
+
+    icon = metadata.get('icon', metadata.get('icon_256', ''))
+    if icon:
+        icon_file = open(icon, 'rb')
+        files.append(('icon_256', icon_file))
+
+    screenshots = metadata.get('screenshots', [])
+    for screenshot in screenshots:
+        screenshot_file = open(screenshot, 'rb')
+        files.append(('screenshots', screenshot_file))
+
+    return files
+
+
+def get_scan_data(session, status_url):
+    """Return metadata about the state of the upload scan process."""
+    # initial retry after 5 seconds
+    # linear backoff after that
+    # abort after 5 retries
+    @retry(terminator=is_scan_completed,
+           retries=SCAN_STATUS_POLL_RETRIES,
+           delay=SCAN_STATUS_POLL_DELAY,
+           backoff=1, logger=logger)
+    def get_status():
+        return session.get(status_url)
+
+    response, aborted = get_status()
+
+    completed = False
+    data = {}
+    if not aborted:
+        completed = is_scan_completed(response)
+        data = response.json()
+    return completed, data

=== added file 'storeapi/channels.py'
--- storeapi/channels.py	1970-01-01 00:00:00 +0000
+++ storeapi/channels.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+
+from storeapi.common import myapps_api_call
+
+
+def get_channels(session, package_name):
+    """Get current channels config for package through API."""
+    channels_endpoint = 'package-channels/%s/' % package_name
+    return myapps_api_call(channels_endpoint, session=session)
+
+
+def update_channels(session, package_name, data):
+    """Update current channels config for package through API."""
+    channels_endpoint = 'package-channels/%s/' % package_name
+    result = myapps_api_call(channels_endpoint, method='POST',
+                             data=data, session=session)
+    if result['success']:
+        result['errors'] = result['data']['errors']
+        result['data'] = result['data']['channels']
+    return result

=== added file 'storeapi/common.py'
--- storeapi/common.py	1970-01-01 00:00:00 +0000
+++ storeapi/common.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,117 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+import json
+import os
+import time
+from functools import wraps
+
+import requests
+from requests_oauthlib import OAuth1Session
+
+from storeapi.compat import urljoin
+from storeapi.constants import MYAPPS_API_ROOT_URL
+
+
+def get_oauth_session(config):
+    """Return a client configured to allow oauth signed requests."""
+    try:
+        session = OAuth1Session(
+            config['consumer_key'],
+            client_secret=config['consumer_secret'],
+            resource_owner_key=config['token_key'],
+            resource_owner_secret=config['token_secret'],
+            signature_method='PLAINTEXT',
+        )
+    except KeyError:
+        session = None
+    return session
+
+
+def myapps_api_call(path, session=None, method='GET', data=None):
+    """Issue a request for a particular endpoint of the MyApps API."""
+    result = {'success': False, 'errors': [], 'data': None}
+    if session is not None:
+        client = session
+    else:
+        client = requests
+
+    root_url = os.environ.get('MYAPPS_API_ROOT_URL', MYAPPS_API_ROOT_URL)
+    url = urljoin(root_url, path)
+    if method == 'GET':
+        response = client.get(url)
+    elif method == 'POST':
+        response = client.post(url, data=data and json.dumps(data) or None,
+                               headers={'Content-Type': 'application/json'})
+    else:
+        raise ValueError('Method {} not supported'.format(method))
+
+    if response.ok:
+        result['success'] = True
+        result['data'] = response.json()
+    else:
+        result['errors'] = [response.text]
+    return result
+
+
+def is_scan_completed(response):
+    """Return True if the response indicates the scan process completed."""
+    if response.ok:
+        return response.json().get('completed', False)
+    return False
+
+
+def retry(terminator=None, retries=3, delay=3, backoff=2, logger=None):
+    """Decorate a function to automatically retry calling it on failure.
+
+    Arguments:
+        - terminator: this should be a callable that returns a boolean;
+          it is used to determine if the function call was successful
+          and the retry loop should be stopped
+        - retries: an integer specifying the maximum number of retries
+        - delay: initial number of seconds to wait for the first retry
+        - backoff: exponential factor to use to adapt the delay between
+          subsequent retries
+        - logger: logging.Logger instance to use for logging
+
+    The decorated function will return as soon as any of the following
+    conditions are met:
+
+        1. terminator evaluates function output as True
+        2. there are no more retries left
+
+    If the terminator callable is not provided, the function will be called
+    exactly once and will not be retried.
+
+    """
+    def decorated(func):
+        if retries != int(retries) or retries < 0:
+            raise ValueError(
+                'retries value must be a positive integer or zero')
+        if delay < 0:
+            raise ValueError('delay value must be positive')
+
+        if backoff != int(backoff) or backoff < 1:
+            raise ValueError('backoff value must be a positive integer')
+
+        @wraps(func)
+        def wrapped(*args, **kwargs):
+            retries_left, current_delay = retries, delay
+
+            result = func(*args, **kwargs)
+            if terminator is not None:
+                while not terminator(result) and retries_left > 0:
+                    msg = "... retrying in %d seconds" % current_delay
+                    if logger:
+                        logger.warning(msg)
+
+                    # sleep
+                    time.sleep(current_delay)
+                    retries_left -= 1
+                    current_delay *= backoff
+
+                    # retry
+                    result = func(*args, **kwargs)
+            return result, retries_left == 0
+
+        return wrapped
+    return decorated

=== added file 'storeapi/compat.py'
--- storeapi/compat.py	1970-01-01 00:00:00 +0000
+++ storeapi/compat.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,12 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+
+
+try:  # pragma: no cover
+    from builtins import open  # noqa
+    from urllib.parse import quote_plus, urljoin
+except ImportError:  # pragma: no cover
+    from __builtin__ import open  # noqa
+    from urllib import quote_plus  # noqa
+    from urlparse import urljoin  # noqa

=== added file 'storeapi/constants.py'
--- storeapi/constants.py	1970-01-01 00:00:00 +0000
+++ storeapi/constants.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,10 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+
+
+CLICK_UPDOWN_UPLOAD_URL = 'https://upload.apps.ubuntu.com/'
+MYAPPS_API_ROOT_URL = 'https://myapps.developer.ubuntu.com/dev/api/'
+UBUNTU_SSO_API_ROOT_URL = 'https://login.ubuntu.com/api/v2/'
+SCAN_STATUS_POLL_DELAY = 5
+SCAN_STATUS_POLL_RETRIES = 5

=== added file 'storeapi/info.py'
--- storeapi/info.py	1970-01-01 00:00:00 +0000
+++ storeapi/info.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+
+from storeapi.common import myapps_api_call
+
+
+def get_info():
+    """Return information about the MyApps API.
+
+    Returned data contains information about:
+    - version
+    - department
+    - license
+    - country
+    - channel
+    """
+    return myapps_api_call('')

=== added directory 'storeapi/tests'
=== added file 'storeapi/tests/__init__.py'
--- storeapi/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ storeapi/tests/__init__.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,2 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).

=== added file 'storeapi/tests/test_channels.py'
--- storeapi/tests/test_channels.py	1970-01-01 00:00:00 +0000
+++ storeapi/tests/test_channels.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+import json
+from unittest import TestCase
+
+from mock import patch
+
+from storeapi.channels import get_channels, update_channels
+
+
+class ChannelsAPITestCase(TestCase):
+
+    def setUp(self):
+        super(ChannelsAPITestCase, self).setUp()
+
+        # setup patches
+        oauth_session = 'storeapi.common.get_oauth_session'
+        patcher = patch(oauth_session)
+        self.mock_get_oauth_session = patcher.start()
+        self.mock_session = self.mock_get_oauth_session.return_value
+        self.addCleanup(patcher.stop)
+
+        self.mock_get = self.mock_session.get
+        self.mock_post = self.mock_session.post
+
+        self.channels_data = [
+            {'channel': 'stable', 'current': {'revision': 2, 'version': '1'}},
+            {'channel': 'beta', 'current': {'revision': 4, 'version': '1.5'}},
+            {'channel': 'edge', 'current': None},
+        ]
+
+    def set_channels_get_success_response(self):
+        mock_response = self.mock_get.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = self.channels_data
+
+    def set_channels_get_error_response(self, error_msg):
+        mock_response = self.mock_get.return_value
+        mock_response.ok = False
+        mock_response.text = error_msg
+
+    def set_channels_post_success_response(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'success': True, 'errors': [], 'channels': self.channels_data
+        }
+
+    def set_channels_post_failed_response(self, error_msg):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'success': True, 'errors': [error_msg],
+            'channels': self.channels_data
+        }
+
+    def set_channels_post_error_response(self, error_msg):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = False
+        mock_response.text = error_msg
+
+    def test_get_channels(self):
+        self.set_channels_get_success_response()
+
+        data = get_channels(self.mock_session, 'package.name')
+
+        expected = {
+            'success': True,
+            'errors': [],
+            'data': self.channels_data,
+        }
+        self.assertEqual(data, expected)
+
+    def test_get_channels_with_error_response(self):
+        error_msg = 'some error'
+        self.set_channels_get_error_response(error_msg)
+
+        data = get_channels(self.mock_session, 'package.name')
+
+        expected = {
+            'success': False,
+            'errors': [error_msg],
+            'data': None,
+        }
+        self.assertEqual(data, expected)
+
+    def test_get_channels_uses_environment_variables(self):
+        with patch('storeapi.common.os.environ',
+                   {'MYAPPS_API_ROOT_URL': 'http://example.com'}):
+            get_channels(self.mock_session, 'package.name')
+        self.mock_get.assert_called_once_with(
+            'http://example.com/package-channels/package.name/')
+
+    def test_update_channels(self):
+        self.set_channels_post_success_response()
+
+        data = update_channels(
+            self.mock_session, 'package.name', {'stable': 2})
+
+        expected = {
+            'success': True,
+            'errors': [],
+            'data': self.channels_data,
+        }
+        self.assertEqual(data, expected)
+
+    def test_update_channels_with_error_response(self):
+        error_msg = 'some error'
+        self.set_channels_post_error_response(error_msg)
+
+        data = update_channels(
+            self.mock_session, 'package.name', {'stable': 2})
+
+        expected = {
+            'success': False,
+            'errors': [error_msg],
+            'data': None,
+        }
+        self.assertEqual(data, expected)
+
+    def test_update_channels_with_failed_response(self):
+        error_msg = 'some error'
+        self.set_channels_post_failed_response(error_msg)
+
+        data = update_channels(
+            self.mock_session, 'package.name', {'stable': 2})
+
+        expected = {
+            'success': True,
+            'errors': [error_msg],
+            'data': self.channels_data,
+        }
+        self.assertEqual(data, expected)
+
+    def test_update_channels_uses_environment_variables(self):
+        with patch('storeapi.common.os.environ',
+                   {'MYAPPS_API_ROOT_URL': 'http://example.com'}):
+            update_channels(
+                self.mock_session, 'package.name', {'stable': 2})
+        self.mock_post.assert_called_once_with(
+            'http://example.com/package-channels/package.name/',
+            data=json.dumps({'stable': 2}),
+            headers={'Content-Type': 'application/json'})

=== added file 'storeapi/tests/test_common.py'
--- storeapi/tests/test_common.py	1970-01-01 00:00:00 +0000
+++ storeapi/tests/test_common.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,203 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+import json
+from unittest import TestCase
+
+import responses
+from mock import Mock, call, patch
+from requests_oauthlib import OAuth1Session
+
+from storeapi.common import (
+    get_oauth_session,
+    myapps_api_call,
+    retry,
+)
+
+
+class GetOAuthSessionTestCase(TestCase):
+
+    def test_get_oauth_session_when_no_config(self):
+        config = {}
+        session = get_oauth_session(config)
+        self.assertIsNone(session)
+
+    def test_get_oauth_session_when_partial_config(self):
+        config = {
+            'consumer_key': 'consumer-key',
+            'consumer_secret': 'consumer-secret',
+        }
+        session = get_oauth_session(config)
+        self.assertIsNone(session)
+
+    def test_get_oauth_session(self):
+        config = {
+            'consumer_key': 'consumer-key',
+            'consumer_secret': 'consumer-secret',
+            'token_key': 'token-key',
+            'token_secret': 'token-secret',
+        }
+        session = get_oauth_session(config)
+        self.assertIsInstance(session, OAuth1Session)
+        self.assertEqual(session.auth.client.client_key, 'consumer-key')
+        self.assertEqual(session.auth.client.client_secret, 'consumer-secret')
+        self.assertEqual(session.auth.client.resource_owner_key, 'token-key')
+        self.assertEqual(session.auth.client.resource_owner_secret,
+                         'token-secret')
+
+
+class ApiCallTestCase(TestCase):
+
+    def setUp(self):
+        super(ApiCallTestCase, self).setUp()
+        p = patch('storeapi.common.os')
+        mock_os = p.start()
+        self.addCleanup(p.stop)
+        mock_os.environ = {'MYAPPS_API_ROOT_URL': 'http://example.com'}
+
+    @responses.activate
+    def test_get_success(self):
+        response_data = {'response': 'value'}
+        responses.add(responses.GET, 'http://example.com/path',
+                      json=response_data)
+
+        result = myapps_api_call('/path')
+        self.assertEqual(result, {
+            'success': True,
+            'data': response_data,
+            'errors': [],
+        })
+
+    @responses.activate
+    def test_get_error(self):
+        response_data = {'response': 'error'}
+        responses.add(responses.GET, 'http://example.com/path',
+                      json=response_data, status=500)
+
+        result = myapps_api_call('/path')
+        self.assertEqual(result, {
+            'success': False,
+            'data': None,
+            'errors': [json.dumps(response_data)],
+        })
+
+    @responses.activate
+    def test_post_success(self):
+        response_data = {'response': 'value'}
+        responses.add(responses.POST, 'http://example.com/path',
+                      json=response_data)
+
+        result = myapps_api_call('/path', method='POST')
+        self.assertEqual(result, {
+            'success': True,
+            'data': response_data,
+            'errors': [],
+        })
+
+    @responses.activate
+    def test_post_error(self):
+        response_data = {'response': 'value'}
+        responses.add(responses.POST, 'http://example.com/path',
+                      json=response_data, status=500)
+
+        result = myapps_api_call('/path', method='POST')
+        self.assertEqual(result, {
+            'success': False,
+            'data': None,
+            'errors': [json.dumps(response_data)],
+        })
+
+    def test_unsupported_method(self):
+        self.assertRaises(ValueError, myapps_api_call, '/path', method='FOO')
+
+    def test_get_with_session(self):
+        session = Mock()
+        myapps_api_call('/path', session=session)
+        session.get.assert_called_once_with('http://example.com/path')
+
+    def test_post_with_session(self):
+        session = Mock()
+        myapps_api_call('/path', method='POST', session=session)
+        session.post.assert_called_once_with(
+            'http://example.com/path',
+            data=None, headers={'Content-Type': 'application/json'})
+
+    @responses.activate
+    def test_post_with_data(self):
+        response_data = {'response': 'value'}
+        responses.add(responses.POST, 'http://example.com/path',
+                      json=response_data)
+
+        result = myapps_api_call(
+            '/path', method='POST', data={'request': 'value'})
+        self.assertEqual(result, {
+            'success': True,
+            'data': response_data,
+            'errors': [],
+        })
+        self.assertEqual(len(responses.calls), 1)
+        self.assertEqual(responses.calls[0].request.headers['Content-Type'],
+                         'application/json')
+        self.assertEqual(responses.calls[0].request.body,
+                         json.dumps({'request': 'value'}))
+
+
+class RetryDecoratorTestCase(TestCase):
+
+    def target(self, *args, **kwargs):
+        return dict(args=args, kwargs=kwargs)
+
+    def test_retry(self):
+        result, aborted = retry()(self.target)()
+        self.assertEqual(result, dict(args=(), kwargs={}))
+        self.assertEqual(aborted, False)
+
+    @patch('storeapi.common.time.sleep')
+    def test_retry_small_backoff(self, mock_sleep):
+        mock_terminator = Mock()
+        mock_terminator.return_value = False
+
+        delay = 0.001
+        result, aborted = retry(mock_terminator, retries=2,
+                                delay=delay)(self.target)()
+
+        self.assertEqual(result, dict(args=(), kwargs={}))
+        self.assertEqual(aborted, True)
+        self.assertEqual(mock_terminator.call_count, 3)
+        self.assertEqual(mock_sleep.mock_calls, [
+            call(delay),
+            call(delay * 2),
+        ])
+
+    def test_retry_abort(self):
+        mock_terminator = Mock()
+        mock_terminator.return_value = False
+        mock_logger = Mock()
+
+        result, aborted = retry(mock_terminator, delay=0.001, backoff=1,
+                                logger=mock_logger)(self.target)()
+
+        self.assertEqual(result, dict(args=(), kwargs={}))
+        self.assertEqual(aborted, True)
+        self.assertEqual(mock_terminator.call_count, 4)
+        self.assertEqual(mock_logger.warning.call_count, 3)
+
+    def test_retry_with_invalid_retries(self):
+        for value in (0.1, -1):
+            with self.assertRaises(ValueError) as ctx:
+                retry(retries=value)(self.target)
+            self.assertEqual(
+                str(ctx.exception),
+                'retries value must be a positive integer or zero')
+
+    def test_retry_with_negative_delay(self):
+        with self.assertRaises(ValueError) as ctx:
+            retry(delay=-1)(self.target)
+        self.assertEqual(str(ctx.exception),
+                         'delay value must be positive')
+
+    def test_retry_with_invalid_backoff(self):
+        for value in (-1, 0, 0.1):
+            with self.assertRaises(ValueError) as ctx:
+                retry(backoff=value)(self.target)
+            self.assertEqual(str(ctx.exception),
+                             'backoff value must be a positive integer')

=== added file 'storeapi/tests/test_info.py'
--- storeapi/tests/test_info.py	1970-01-01 00:00:00 +0000
+++ storeapi/tests/test_info.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+from unittest import TestCase
+
+from mock import patch
+
+from storeapi.info import get_info
+
+
+class InfoAPITestCase(TestCase):
+
+    def setUp(self):
+        super(InfoAPITestCase, self).setUp()
+
+        patcher = patch('storeapi.common.requests.get')
+        self.mock_get = patcher.start()
+        self.mock_response = self.mock_get.return_value
+        self.addCleanup(patcher.stop)
+
+    def test_get_info(self):
+        expected = {
+            'success': True,
+            'errors': [],
+            'data': {'version': 1},
+        }
+        self.mock_response.ok = True
+        self.mock_response.json.return_value = {'version': 1}
+        data = get_info()
+        self.assertEqual(data, expected)
+
+    def test_get_info_with_error_response(self):
+        expected = {
+            'success': False,
+            'errors': ['some error'],
+            'data': None,
+        }
+        self.mock_response.ok = False
+        self.mock_response.text = 'some error'
+        data = get_info()
+        self.assertEqual(data, expected)
+
+    def test_get_info_uses_environment_variables(self):
+        with patch('storeapi.common.os.environ',
+                   {'MYAPPS_API_ROOT_URL': 'http://example.com'}):
+            get_info()
+        self.mock_get.assert_called_once_with('http://example.com')

=== added file 'storeapi/tests/test_login.py'
--- storeapi/tests/test_login.py	1970-01-01 00:00:00 +0000
+++ storeapi/tests/test_login.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+import json
+from unittest import TestCase
+
+from mock import patch
+from requests import Response
+
+from storeapi._login import login
+from storeapi.constants import (
+    UBUNTU_SSO_API_ROOT_URL,
+)
+
+
+class LoginAPITestCase(TestCase):
+
+    def setUp(self):
+        super(LoginAPITestCase, self).setUp()
+        self.email = '[e-mail]'
+        self.password = 'password'
+        self.token_name = 'token-name'
+
+        # setup patches
+        mock_environ = {
+            'UBUNTU_SSO_API_ROOT_URL': UBUNTU_SSO_API_ROOT_URL,
+        }
+        patcher = patch('storeapi._login.os.environ', mock_environ)
+        patcher.start()
+        self.addCleanup(patcher.stop)
+
+        patcher = patch('ssoclient.v2.http.requests.Session.request')
+        self.mock_request = patcher.start()
+        self.addCleanup(patcher.stop)
+        self.token_data = {
+            'consumer_key': 'consumer-key',
+            'consumer_secret': 'consumer-secret',
+            'token_key': 'token-key',
+            'token_secret': 'token-secret',
+        }
+        response = self.make_response(status_code=201, reason='CREATED',
+                                      data=self.token_data)
+        self.mock_request.return_value = response
+
+    def make_response(self, status_code=200, reason='OK', data=None):
+        data = data or {}
+        response = Response()
+        response.status_code = status_code
+        response.reason = reason
+        response._content = json.dumps(data).encode('utf-8')
+        return response
+
+    def assert_login_request(self, otp=None, token_name=None):
+        if token_name is None:
+            token_name = self.token_name
+        data = {
+            'email': self.email,
+            'password': self.password,
+            'token_name': token_name
+        }
+        if otp is not None:
+            data['otp'] = otp
+        self.mock_request.assert_called_once_with(
+            'POST', UBUNTU_SSO_API_ROOT_URL + 'tokens/oauth',
+            data=json.dumps(data),
+            json=None, headers={'Content-Type': 'application/json'}
+        )
+
+    def test_login_successful(self):
+        result = login(self.email, self.password, self.token_name)
+        expected = {'success': True, 'body': self.token_data}
+        self.assertEqual(result, expected)
+
+    def test_default_token_name(self):
+        result = login(self.email, self.password, self.token_name)
+        expected = {'success': True, 'body': self.token_data}
+        self.assertEqual(result, expected)
+        self.assert_login_request()
+
+    def test_custom_token_name(self):
+        result = login(self.email, self.password, token_name='my-token')
+        expected = {'success': True, 'body': self.token_data}
+        self.assertEqual(result, expected)
+        self.assert_login_request(token_name='my-token')
+
+    def test_login_with_otp(self):
+        result = login(self.email, self.password, self.token_name,
+                       otp='123456')
+        expected = {'success': True, 'body': self.token_data}
+        self.assertEqual(result, expected)
+        self.assert_login_request(otp='123456')
+
+    def test_login_unsuccessful_api_exception(self):
+        error_data = {
+            'message': 'Error during login.',
+            'code': 'INVALID_CREDENTIALS',
+            'extra': {},
+        }
+        response = self.make_response(
+            status_code=401, reason='UNAUTHORISED', data=error_data)
+        self.mock_request.return_value = response
+
+        result = login(self.email, self.password, self.token_name)
+        expected = {'success': False, 'body': error_data}
+        self.assertEqual(result, expected)
+
+    def test_login_unsuccessful_unexpected_error(self):
+        error_data = {
+            'message': 'Error during login.',
+            'code': 'UNEXPECTED_ERROR_CODE',
+            'extra': {},
+        }
+        response = self.make_response(
+            status_code=401, reason='UNAUTHORISED', data=error_data)
+        self.mock_request.return_value = response
+
+        result = login(self.email, self.password, self.token_name)
+        expected = {'success': False, 'body': error_data}
+        self.assertEqual(result, expected)

=== added file 'storeapi/tests/test_upload.py'
--- storeapi/tests/test_upload.py	1970-01-01 00:00:00 +0000
+++ storeapi/tests/test_upload.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,505 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+from __future__ import absolute_import, unicode_literals
+import json
+import os
+import tempfile
+from unittest import TestCase
+
+from mock import ANY, patch
+from requests import Response
+
+from storeapi._upload import (
+    get_upload_url,
+    upload_app,
+    upload_files,
+    upload,
+)
+
+
+class UploadBaseTestCase(TestCase):
+
+    def setUp(self):
+        super(UploadBaseTestCase, self).setUp()
+
+        # setup patches
+        name = 'storeapi._upload.get_oauth_session'
+        patcher = patch(name)
+        self.mock_get_oauth_session = patcher.start()
+        self.addCleanup(patcher.stop)
+
+        self.mock_get = self.mock_get_oauth_session.return_value.get
+        self.mock_post = self.mock_get_oauth_session.return_value.post
+
+        self.suffix = '_0.1_all.click'
+        self.binary_file = self.get_temporary_file(suffix=self.suffix)
+
+    def get_temporary_file(self, suffix='.cfg'):
+        return tempfile.NamedTemporaryFile(suffix=suffix)
+
+
+class UploadWithScanTestCase(UploadBaseTestCase):
+
+    def test_default_metadata(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'successful': True,
+            'upload_id': 'some-valid-upload-id',
+        }
+
+        upload(self.binary_file.name)
+
+        data = {
+            'updown_id': 'some-valid-upload-id',
+            'source_uploaded': False,
+            'binary_filesize': 0,
+        }
+        name = os.path.basename(self.binary_file.name).replace(self.suffix, '')
+        self.mock_post.assert_called_with(
+            get_upload_url(name), data=data, files=[])
+
+    def test_metadata_from_file(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'successful': True,
+            'upload_id': 'some-valid-upload-id',
+        }
+
+        with self.get_temporary_file() as metadata_file:
+            data = json.dumps({'name': 'from_file'})
+            metadata_file.write(data.encode('utf-8'))
+            metadata_file.flush()
+
+            upload(
+                self.binary_file.name, metadata_filename=metadata_file.name)
+
+        data = {
+            'updown_id': 'some-valid-upload-id',
+            'source_uploaded': False,
+            'binary_filesize': 0,
+            'name': 'from_file',
+        }
+        name = os.path.basename(self.binary_file.name).replace(self.suffix, '')
+        self.mock_post.assert_called_with(
+            get_upload_url(name), data=data, files=[])
+
+    def test_override_metadata(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'successful': True,
+            'upload_id': 'some-valid-upload-id',
+        }
+
+        upload(
+            self.binary_file.name, metadata={'name': 'overridden'})
+
+        data = {
+            'updown_id': 'some-valid-upload-id',
+            'source_uploaded': False,
+            'binary_filesize': 0,
+            'name': 'overridden',
+        }
+        name = os.path.basename(self.binary_file.name).replace(self.suffix, '')
+        self.mock_post.assert_called_with(
+            get_upload_url(name), data=data, files=[])
+
+
+class UploadFilesTestCase(UploadBaseTestCase):
+
+    def setUp(self):
+        super(UploadFilesTestCase, self).setUp()
+        self.binary_file = self.get_temporary_file(suffix='_0.1_all.click')
+
+    def test_upload_files(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'successful': True,
+            'upload_id': 'some-valid-upload-id',
+        }
+
+        response = upload_files(self.binary_file.name)
+        self.assertEqual(response, {
+            'success': True,
+            'errors': [],
+            'upload_id': 'some-valid-upload-id',
+            'binary_filesize': os.path.getsize(self.binary_file.name),
+            'source_uploaded': False,
+        })
+
+    def test_upload_files_uses_environment_variables(self):
+        with patch.dict(os.environ,
+                        CLICK_UPDOWN_UPLOAD_URL='http://example.com'):
+            upload_url = 'http://example.com/unscanned-upload/'
+            upload_files(self.binary_file.name)
+            self.mock_post.assert_called_once_with(
+                upload_url, files={'binary': ANY})
+
+    def test_upload_files_with_source_upload(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'successful': True,
+            'upload_id': 'some-valid-upload-id',
+        }
+
+        response = upload_files(self.binary_file.name)
+        self.assertEqual(response, {
+            'success': True,
+            'errors': [],
+            'upload_id': 'some-valid-upload-id',
+            'binary_filesize': os.path.getsize(self.binary_file.name),
+            'source_uploaded': False,
+        })
+
+    def test_upload_files_with_invalid_oauth_session(self):
+        self.mock_get_oauth_session.return_value = None
+        response = upload_files(self.binary_file.name)
+        self.assertEqual(response, {
+            'success': False,
+            'errors': ['No valid credentials found.'],
+        })
+        self.assertFalse(self.mock_post.called)
+
+    def test_upload_files_error_response(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = False
+        mock_response.reason = '500 INTERNAL SERVER ERROR'
+        mock_response.text = 'server failed'
+
+        response = upload_files(self.binary_file.name)
+        self.assertEqual(response, {
+            'success': False,
+            'errors': ['server failed'],
+        })
+
+    def test_upload_files_handle_malformed_response(self):
+        mock_response = self.mock_post.return_value
+        mock_response.json.return_value = {'successful': False}
+
+        response = upload_files(self.binary_file.name)
+        err = KeyError('upload_id')
+        self.assertEqual(response, {
+            'success': False,
+            'errors': [str(err)],
+        })
+
+
+class UploadAppTestCase(UploadBaseTestCase):
+
+    def setUp(self):
+        super(UploadAppTestCase, self).setUp()
+        self.data = {
+            'upload_id': 'some-valid-upload-id',
+            'binary_filesize': 123456,
+            'source_uploaded': False,
+        }
+        self.package_name = 'namespace.binary'
+
+        patcher = patch.multiple(
+            'storeapi._upload',
+            SCAN_STATUS_POLL_DELAY=0.0001)
+        patcher.start()
+        self.addCleanup(patcher.stop)
+
+    def test_upload_app_with_invalid_oauth_session(self):
+        self.mock_get_oauth_session.return_value = None
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': False,
+            'errors': ['No valid credentials found.'],
+            'application_url': '',
+            'revision': None,
+        })
+
+    def test_upload_app_uses_environment_variables(self):
+        with patch.dict(os.environ,
+                        MYAPPS_API_ROOT_URL='http://example.com'):
+            upload_url = ("http://example.com/click-package-upload/%s/" %
+                          self.package_name)
+            data = {
+                'updown_id': self.data['upload_id'],
+                'binary_filesize': self.data['binary_filesize'],
+                'source_uploaded': self.data['source_uploaded'],
+            }
+            upload_app(self.package_name, self.data)
+            self.mock_post.assert_called_once_with(
+                upload_url, data=data, files=[])
+
+    def test_upload_app(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'success': True,
+            'status_url': 'http://example.com/status/'
+        }
+
+        mock_status_response = self.mock_get.return_value
+        mock_status_response.ok = True
+        mock_status_response.json.return_value = {
+            'completed': True,
+            'revision': 15,
+        }
+
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': True,
+            'errors': [],
+            'application_url': '',
+            'revision': 15,
+        })
+
+    def test_upload_app_error_response(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = False
+        mock_response.reason = '500 INTERNAL SERVER ERROR'
+        mock_response.text = 'server failure'
+
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': False,
+            'errors': ['server failure'],
+            'application_url': '',
+            'revision': None,
+        })
+
+    def test_upload_app_handle_malformed_response(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {}
+
+        response = upload_app(self.package_name, self.data)
+        err = KeyError('status_url')
+        self.assertEqual(response, {
+            'success': False,
+            'errors': [str(err)],
+            'application_url': '',
+            'revision': None,
+        })
+
+    def test_upload_app_with_errors_during_scan(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'success': True,
+            'status_url': 'http://example.com/status/'
+        }
+
+        mock_status_response = self.mock_get.return_value
+        mock_status_response.ok = True
+        mock_status_response.json.return_value = {
+            'completed': True,
+            'message': 'some error',
+            'application_url': 'http://example.com/myapp',
+        }
+
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': False,
+            'errors': ['some error'],
+            'application_url': 'http://example.com/myapp',
+            'revision': None,
+        })
+
+    def test_upload_app_poll_status(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.return_value = {
+            'success': True,
+            'status_url': 'http://example.com/status/'
+        }
+
+        response_not_completed = Response()
+        response_not_completed.status_code = 200
+        response_not_completed.encoding = 'utf-8'
+        response_not_completed._content = json.dumps(
+            {'completed': False, 'application_url': ''}).encode('utf-8')
+        response_completed = Response()
+        response_completed.status_code = 200
+        response_completed.encoding = 'utf-8'
+        response_completed._content = json.dumps(
+            {'completed': True, 'revision': 14,
+             'application_url': 'http://example.org'}).encode('utf-8')
+        self.mock_get.side_effect = [
+            response_not_completed,
+            response_not_completed,
+            response_completed,
+        ]
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': True,
+            'errors': [],
+            'application_url': 'http://example.org',
+            'revision': 14,
+        })
+        self.assertEqual(self.mock_get.call_count, 3)
+
+    def test_upload_app_ignore_non_ok_responses(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.return_value = {
+            'success': True,
+            'status_url': 'http://example.com/status/',
+        }
+
+        ok_response = Response()
+        ok_response.status_code = 200
+        ok_response.encoding = 'utf-8'
+        ok_response._content = json.dumps(
+            {'completed': True, 'revision': 14}).encode('utf-8')
+        nok_response = Response()
+        nok_response.status_code = 503
+
+        self.mock_get.side_effect = [nok_response, nok_response, ok_response]
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': True,
+            'errors': [],
+            'application_url': '',
+            'revision': 14,
+        })
+        self.assertEqual(self.mock_get.call_count, 3)
+
+    def test_upload_app_abort_polling(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'success': True,
+            'status_url': 'http://example.com/status/',
+            'web_status_url': 'http://example.com/status-web/',
+        }
+
+        mock_status_response = self.mock_get.return_value
+        mock_status_response.ok = True
+        mock_status_response.json.return_value = {
+            'completed': False
+        }
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': False,
+            'errors': [
+                'Package scan took too long.',
+                'Please check the status later at: '
+                'http://example.com/status-web/.',
+            ],
+            'application_url': '',
+            'revision': None,
+        })
+
+    def test_upload_app_abort_polling_without_web_status_url(self):
+        mock_response = self.mock_post.return_value
+        mock_response.ok = True
+        mock_response.json.return_value = {
+            'success': True,
+            'status_url': 'http://example.com/status/',
+        }
+
+        mock_status_response = self.mock_get.return_value
+        mock_status_response.ok = True
+        mock_status_response.json.return_value = {
+            'completed': False
+        }
+        response = upload_app(self.package_name, self.data)
+        self.assertEqual(response, {
+            'success': False,
+            'errors': [
+                'Package scan took too long.',
+            ],
+            'application_url': '',
+            'revision': None,
+        })
+
+    def test_upload_app_with_metadata(self):
+        upload_app(self.package_name, self.data, metadata={
+            'changelog': 'some changes', 'tagline': 'a tagline'})
+        self.mock_post.assert_called_once_with(
+            ANY,
+            data={
+                'updown_id': self.data['upload_id'],
+                'binary_filesize': self.data['binary_filesize'],
+                'source_uploaded': self.data['source_uploaded'],
+                'changelog': 'some changes',
+                'tagline': 'a tagline',
+            },
+            files=[],
+        )
+
+    def test_upload_app_ignore_special_attributes_in_metadata(self):
+        upload_app(
+            self.package_name,
+            self.data, metadata={
+                'changelog': 'some changes',
+                'tagline': 'a tagline',
+                'upload_id': 'my-own-id',
+                'binary_filesize': 0,
+                'source_uploaded': False,
+            })
+        self.mock_post.assert_called_once_with(
+            ANY,
+            data={
+                'updown_id': self.data['upload_id'],
+                'binary_filesize': self.data['binary_filesize'],
+                'source_uploaded': self.data['source_uploaded'],
+                'changelog': 'some changes',
+                'tagline': 'a tagline',
+            },
+            files=[],
+        )
+
+    @patch('storeapi._upload.open')
+    def test_upload_app_with_icon(self, mock_open):
+        with tempfile.NamedTemporaryFile() as icon:
+            mock_open.return_value = icon
+
+            upload_app(
+                self.package_name, self.data,
+                metadata={
+                    'icon_256': icon.name,
+                }
+            )
+            self.mock_post.assert_called_once_with(
+                ANY,
+                data={
+                    'updown_id': self.data['upload_id'],
+                    'binary_filesize': self.data['binary_filesize'],
+                    'source_uploaded': self.data['source_uploaded'],
+                },
+                files=[
+                    ('icon_256', icon),
+                ],
+            )
+
+    @patch('storeapi._upload.open')
+    def test_upload_app_with_screenshots(self, mock_open):
+        screenshot1 = tempfile.NamedTemporaryFile()
+        screenshot2 = tempfile.NamedTemporaryFile()
+        mock_open.side_effect = [screenshot1, screenshot2]
+
+        upload_app(
+            self.package_name, self.data,
+            metadata={
+                'screenshots': [screenshot1.name, screenshot2.name],
+            }
+        )
+        self.mock_post.assert_called_once_with(
+            ANY,
+            data={
+                'updown_id': self.data['upload_id'],
+                'binary_filesize': self.data['binary_filesize'],
+                'source_uploaded': self.data['source_uploaded'],
+            },
+            files=[
+                ('screenshots', screenshot1),
+                ('screenshots', screenshot2),
+            ],
+        )
+
+    def test_get_upload_url(self):
+        with patch.dict(os.environ,
+                        MYAPPS_API_ROOT_URL='http://example.com'):
+            upload_url = "http://example.com/click-package-upload/app.dev/"
+            url = get_upload_url('app.dev')
+            self.assertEqual(url, upload_url)

=== added file 'tests.py'
--- tests.py	1970-01-01 00:00:00 +0000
+++ tests.py	2016-01-08 11:50:10 +0000
@@ -0,0 +1,9 @@
+from unittest import TestLoader, TestSuite
+
+
+def load_tests(loader, tests, pattern):
+    suites = [
+        TestLoader().discover('click_toolbelt', top_level_dir='.'),
+        TestLoader().discover('storeapi', top_level_dir='.'),
+    ]
+    return TestSuite(suites)