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

[Ricardo Kirkner]

split store api into standalone namespace for easier vendoring

Supersedes https://code.launchpad.net/~ricardokirkner/click-toolbelt/split-store-api-namespace/+merge/281986

[Fabián Ezequiel Gallina (fgallina)]

LGTM

review: Approve

[Matias Bordese (matiasb)]

LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-02-24 12:43:21 +0000
+++ Makefile	2016-01-08 14:21:43 +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
 
 
=== modified file 'click_toolbelt/channels.py'
--- click_toolbelt/channels.py	2015-12-22 15:28:53 +0000
+++ click_toolbelt/channels.py	2016-01-08 14:21:43 +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 14:21:43 +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 14:21:43 +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 14:21:43 +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):
 
=== 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 14:21:43 +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 14:21:43 +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 14:21:43 +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 14:21:43 +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 14:21:43 +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 14:21:43 +0000
@@ -67,7 +67,7 @@
 
     zip_safe=False,
 
-    test_suite='click_toolbelt.tests',
+    test_suite='tests',
     tests_require=[
         'mock',
         'responses',
 
=== renamed directory 'click_toolbelt/api' => 'storeapi'
=== modified file 'storeapi/_login.py'
--- click_toolbelt/api/_login.py	2015-12-21 18:41:57 +0000
+++ storeapi/_login.py	2016-01-08 14:21:43 +0000
@@ -10,13 +10,12 @@
     V2ApiClient,
 )
 
-from click_toolbelt.constants import (
-    CLICK_TOOLBELT_PROJECT_NAME,
+from storeapi.constants import (
     UBUNTU_SSO_API_ROOT_URL,
 )
 
 
-def login(email, password, otp=None, token_name=CLICK_TOOLBELT_PROJECT_NAME):
+def login(email, password, token_name, otp=None):
     """Log in via the Ubuntu One SSO API.
 
     If successful, returns the oauth token data.
 
=== modified file 'storeapi/_upload.py'
--- click_toolbelt/api/_upload.py	2015-12-21 18:41:57 +0000
+++ storeapi/_upload.py	2016-01-08 14:21:43 +0000
@@ -6,13 +6,13 @@
 import os
 import re
 
-from click_toolbelt.api.common import get_oauth_session
-from click_toolbelt.common import (
+from storeapi.common import (
+    get_oauth_session,
     is_scan_completed,
     retry,
 )
-from click_toolbelt.compat import open, quote_plus, urljoin
-from click_toolbelt.constants import (
+from storeapi.compat import open, quote_plus, urljoin
+from storeapi.constants import (
     CLICK_UPDOWN_UPLOAD_URL,
     MYAPPS_API_ROOT_URL,
     SCAN_STATUS_POLL_DELAY,
@@ -61,11 +61,11 @@
 
     if errors:
         logger.info('Some errors were detected:\n\n%s\n\n',
-                      '\n'.join(errors))
+                    '\n'.join(errors))
 
     if app_url:
         logger.info('Please check out the application at: %s.\n',
-                      app_url)
+                    app_url)
 
     return success
 
 
=== modified file 'storeapi/channels.py'
--- click_toolbelt/api/channels.py	2015-12-09 19:10:19 +0000
+++ storeapi/channels.py	2016-01-08 14:21:43 +0000
@@ -3,7 +3,7 @@
 # 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
+from storeapi.common import myapps_api_call
 
 
 def get_channels(session, package_name):
@@ -15,8 +15,8 @@
 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)
+    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']
 
=== modified file 'storeapi/common.py'
--- click_toolbelt/api/common.py	2015-12-11 20:03:40 +0000
+++ storeapi/common.py	2016-01-08 14:21:43 +0000
@@ -2,18 +2,18 @@
 # 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 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():
+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."""
-    config = load_config()
     try:
         session = OAuth1Session(
             config['consumer_key'],
@@ -51,3 +51,67 @@
     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 14:21:43 +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 14:21:43 +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
 
=== modified file 'storeapi/info.py'
--- click_toolbelt/api/info.py	2015-12-09 19:10:19 +0000
+++ storeapi/info.py	2016-01-08 14:21:43 +0000
@@ -3,7 +3,7 @@
 # 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
+from storeapi.common import myapps_api_call
 
 
 def get_info():
 
=== renamed directory 'click_toolbelt/tests/api' => 'storeapi/tests'
=== modified file 'storeapi/tests/test_channels.py'
--- click_toolbelt/tests/api/test_channels.py	2015-12-21 16:05:53 +0000
+++ storeapi/tests/test_channels.py	2016-01-08 14:21:43 +0000
@@ -3,20 +3,20 @@
 # 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 click_toolbelt.api.channels import get_channels, update_channels
-from click_toolbelt.tests.test_config import ConfigTestCase
-
-
-class ChannelsAPITestCase(ConfigTestCase):
+from storeapi.channels import get_channels, update_channels
+
+
+class ChannelsAPITestCase(TestCase):
 
     def setUp(self):
         super(ChannelsAPITestCase, self).setUp()
 
         # setup patches
-        oauth_session = 'click_toolbelt.api.common.get_oauth_session'
+        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
@@ -87,7 +87,7 @@
         self.assertEqual(data, expected)
 
     def test_get_channels_uses_environment_variables(self):
-        with patch('click_toolbelt.api.common.os.environ',
+        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(
@@ -135,7 +135,7 @@
         self.assertEqual(data, expected)
 
     def test_update_channels_uses_environment_variables(self):
-        with patch('click_toolbelt.api.common.os.environ',
+        with patch('storeapi.common.os.environ',
                    {'MYAPPS_API_ROOT_URL': 'http://example.com'}):
             update_channels(
                 self.mock_session, 'package.name', {'stable': 2})
 
=== modified file 'storeapi/tests/test_common.py'
--- click_toolbelt/tests/api/test_common.py	2015-12-11 20:03:40 +0000
+++ storeapi/tests/test_common.py	2016-01-08 14:21:43 +0000
@@ -4,42 +4,39 @@
 from unittest import TestCase
 
 import responses
-from mock import Mock, patch
+from mock import Mock, call, patch
 from requests_oauthlib import OAuth1Session
 
-from click_toolbelt.api.common import get_oauth_session, myapps_api_call
+from storeapi.common import (
+    get_oauth_session,
+    myapps_api_call,
+    retry,
+)
 
 
 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()
+        config = {}
+        session = get_oauth_session(config)
         self.assertIsNone(session)
 
     def test_get_oauth_session_when_partial_config(self):
-        self.mock_load_config.return_value = {
+        config = {
             'consumer_key': 'consumer-key',
             'consumer_secret': 'consumer-secret',
         }
-        session = get_oauth_session()
+        session = get_oauth_session(config)
         self.assertIsNone(session)
 
     def test_get_oauth_session(self):
-        self.mock_load_config.return_value = {
+        config = {
             'consumer_key': 'consumer-key',
             'consumer_secret': 'consumer-secret',
             'token_key': 'token-key',
             'token_secret': 'token-secret',
         }
-        session = get_oauth_session()
+        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')
@@ -52,7 +49,7 @@
 
     def setUp(self):
         super(ApiCallTestCase, self).setUp()
-        p = patch('click_toolbelt.api.common.os')
+        p = patch('storeapi.common.os')
         mock_os = p.start()
         self.addCleanup(p.stop)
         mock_os.environ = {'MYAPPS_API_ROOT_URL': 'http://example.com'}
@@ -130,7 +127,8 @@
         responses.add(responses.POST, 'http://example.com/path',
                       json=response_data)
 
-        result = myapps_api_call('/path', method='POST', data={'request': 'value'})
+        result = myapps_api_call(
+            '/path', method='POST', data={'request': 'value'})
         self.assertEqual(result, {
             'success': True,
             'data': response_data,
@@ -141,3 +139,65 @@
                          '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')
 
=== modified file 'storeapi/tests/test_info.py'
--- click_toolbelt/tests/api/test_info.py	2015-12-09 19:10:19 +0000
+++ storeapi/tests/test_info.py	2016-01-08 14:21:43 +0000
@@ -6,7 +6,7 @@
 
 from mock import patch
 
-from click_toolbelt.api.info import get_info
+from storeapi.info import get_info
 
 
 class InfoAPITestCase(TestCase):
@@ -14,7 +14,7 @@
     def setUp(self):
         super(InfoAPITestCase, self).setUp()
 
-        patcher = patch('click_toolbelt.api.common.requests.get')
+        patcher = patch('storeapi.common.requests.get')
         self.mock_get = patcher.start()
         self.mock_response = self.mock_get.return_value
         self.addCleanup(patcher.stop)
@@ -42,7 +42,7 @@
         self.assertEqual(data, expected)
 
     def test_get_info_uses_environment_variables(self):
-        with patch('click_toolbelt.api.common.os.environ',
+        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')
 
=== modified file 'storeapi/tests/test_login.py'
--- click_toolbelt/tests/api/test_login.py	2015-12-21 18:41:57 +0000
+++ storeapi/tests/test_login.py	2016-01-08 14:21:43 +0000
@@ -8,9 +8,8 @@
 from mock import patch
 from requests import Response
 
-from click_toolbelt.api._login import login
-from click_toolbelt.constants import (
-    CLICK_TOOLBELT_PROJECT_NAME,
+from storeapi._login import login
+from storeapi.constants import (
     UBUNTU_SSO_API_ROOT_URL,
 )
 
@@ -21,12 +20,13 @@
         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('click_toolbelt.api._login.os.environ', mock_environ)
+        patcher = patch('storeapi._login.os.environ', mock_environ)
         patcher.start()
         self.addCleanup(patcher.stop)
 
@@ -51,8 +51,9 @@
         response._content = json.dumps(data).encode('utf-8')
         return response
 
-    def assert_login_request(self, otp=None,
-                             token_name=CLICK_TOOLBELT_PROJECT_NAME):
+    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,
@@ -67,12 +68,12 @@
         )
 
     def test_login_successful(self):
-        result = login(self.email, self.password)
+        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)
+        result = login(self.email, self.password, self.token_name)
         expected = {'success': True, 'body': self.token_data}
         self.assertEqual(result, expected)
         self.assert_login_request()
@@ -84,7 +85,8 @@
         self.assert_login_request(token_name='my-token')
 
     def test_login_with_otp(self):
-        result = login(self.email, self.password, otp='123456')
+        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')
@@ -99,7 +101,7 @@
             status_code=401, reason='UNAUTHORISED', data=error_data)
         self.mock_request.return_value = response
 
-        result = login(self.email, self.password)
+        result = login(self.email, self.password, self.token_name)
         expected = {'success': False, 'body': error_data}
         self.assertEqual(result, expected)
 
@@ -113,6 +115,6 @@
             status_code=401, reason='UNAUTHORISED', data=error_data)
         self.mock_request.return_value = response
 
-        result = login(self.email, self.password)
+        result = login(self.email, self.password, self.token_name)
         expected = {'success': False, 'body': error_data}
         self.assertEqual(result, expected)
 
=== modified file 'storeapi/tests/test_upload.py'
--- click_toolbelt/tests/api/test_upload.py	2015-12-21 18:41:57 +0000
+++ storeapi/tests/test_upload.py	2016-01-08 14:21:43 +0000
@@ -4,28 +4,26 @@
 import json
 import os
 import tempfile
+from unittest import TestCase
 
 from mock import ANY, patch
 from requests import Response
 
-from click_toolbelt.api._upload import (
+from storeapi._upload import (
     get_upload_url,
     upload_app,
     upload_files,
     upload,
 )
-from click_toolbelt.tests.test_config import (
-    ConfigTestCase,
-)
-
-
-class UploadBaseTestCase(ConfigTestCase):
+
+
+class UploadBaseTestCase(TestCase):
 
     def setUp(self):
         super(UploadBaseTestCase, self).setUp()
 
         # setup patches
-        name = 'click_toolbelt.api._upload.get_oauth_session'
+        name = 'storeapi._upload.get_oauth_session'
         patcher = patch(name)
         self.mock_get_oauth_session = patcher.start()
         self.addCleanup(patcher.stop)
@@ -33,14 +31,15 @@
         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 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
@@ -201,7 +200,7 @@
         self.package_name = 'namespace.binary'
 
         patcher = patch.multiple(
-            'click_toolbelt.api._upload',
+            'storeapi._upload',
             SCAN_STATUS_POLL_DELAY=0.0001)
         patcher.start()
         self.addCleanup(patcher.stop)
@@ -450,7 +449,7 @@
             files=[],
         )
 
-    @patch('click_toolbelt.api._upload.open')
+    @patch('storeapi._upload.open')
     def test_upload_app_with_icon(self, mock_open):
         with tempfile.NamedTemporaryFile() as icon:
             mock_open.return_value = icon
@@ -473,7 +472,7 @@
                 ],
             )
 
-    @patch('click_toolbelt.api._upload.open')
+    @patch('storeapi._upload.open')
     def test_upload_app_with_screenshots(self, mock_open):
         screenshot1 = tempfile.NamedTemporaryFile()
         screenshot2 = tempfile.NamedTemporaryFile()
 
=== added file 'tests.py'
--- tests.py	1970-01-01 00:00:00 +0000
+++ tests.py	2016-01-08 14:21:43 +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)