← Back to branch summary

~ricardokirkner/click-toolbelt/fix-storeapi-upload-missing-config

« back to all changes in this revision

Viewing changes to click_toolbelt/tests/api/test_upload.py

  • Committer: Ricardo Kirkner
  • Date: 2015-12-21 18:41:57 UTC
  • mto: This revision was merged to the branch mainline in revision 48.
  • Revision ID: ricardo.kirkner@canonical.com-20151221184157-w5tyoho8grkyk1cy
expose api via flat namespace

refactor api package to expose functions on a flat namespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
click_toolbelt/tests/api/test_upload.py
8
8
from mock import ANY, patch
9
9
from requests import Response
10
10
 
11
 
from click_toolbelt.api.upload import (
 
11
from click_toolbelt.api._upload import (
12
12
    get_upload_url,
13
13
    upload_app,
14
14
    upload_files,
15
 
    upload_with_scan,
 
15
    upload,
16
16
)
17
17
from click_toolbelt.tests.test_config import (
18
18
    ConfigTestCase,
25
25
        super(UploadBaseTestCase, self).setUp()
26
26
 
27
27
        # setup patches
28
 
        name = 'click_toolbelt.api.upload.get_oauth_session'
 
28
        name = 'click_toolbelt.api._upload.get_oauth_session'
29
29
        patcher = patch(name)
30
30
        self.mock_get_oauth_session = patcher.start()
31
31
        self.addCleanup(patcher.stop)
49
49
            'upload_id': 'some-valid-upload-id',
50
50
        }
51
51
 
52
 
        upload_with_scan(self.binary_file.name)
 
52
        upload(self.binary_file.name)
53
53
 
54
54
        data = {
55
55
            'updown_id': 'some-valid-upload-id',
73
73
            metadata_file.write(data.encode('utf-8'))
74
74
            metadata_file.flush()
75
75
 
76
 
            upload_with_scan(
 
76
            upload(
77
77
                self.binary_file.name, metadata_filename=metadata_file.name)
78
78
 
79
79
        data = {
94
94
            'upload_id': 'some-valid-upload-id',
95
95
        }
96
96
 
97
 
        upload_with_scan(
 
97
        upload(
98
98
            self.binary_file.name, metadata={'name': 'overridden'})
99
99
 
100
100
        data = {
201
201
        self.package_name = 'namespace.binary'
202
202
 
203
203
        patcher = patch.multiple(
204
 
            'click_toolbelt.api.upload',
 
204
            'click_toolbelt.api._upload',
205
205
            SCAN_STATUS_POLL_DELAY=0.0001)
206
206
        patcher.start()
207
207
        self.addCleanup(patcher.stop)
450
450
            files=[],
451
451
        )
452
452
 
453
 
    @patch('click_toolbelt.api.upload.open')
 
453
    @patch('click_toolbelt.api._upload.open')
454
454
    def test_upload_app_with_icon(self, mock_open):
455
455
        with tempfile.NamedTemporaryFile() as icon:
456
456
            mock_open.return_value = icon
473
473
                ],
474
474
            )
475
475
 
476
 
    @patch('click_toolbelt.api.upload.open')
 
476
    @patch('click_toolbelt.api._upload.open')
477
477
    def test_upload_app_with_screenshots(self, mock_open):
478
478
        screenshot1 = tempfile.NamedTemporaryFile()
479
479
        screenshot2 = tempfile.NamedTemporaryFile()