send the requested sdk version to builder (bug 692231)

This commit is contained in:
Jeff Balogh 2011-10-19 16:09:48 -07:00
Родитель e68275bc38
Коммит 34dc728abe
3 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -221,7 +221,7 @@ def send_upgrade_email(addon, new_version, sdk_version):
@task
def start_upgrade(file_ids, priority='low', **kw):
def start_upgrade(file_ids, sdk_version=None, priority='low', **kw):
upgrader = JetpackUpgrader()
minver, maxver = upgrader.jetpack_versions()
files = File.objects.filter(id__in=file_ids).select_related('version')
@ -250,6 +250,8 @@ def start_upgrade(file_ids, priority='low', **kw):
'location': file_.get_url_path('builder'),
'uuid': data['uuid'],
'pingback': absolutify(reverse('amo.builder-pingback'))}
if sdk_version:
post['sdk_version'] = sdk_version
try:
jp_log.info(urllib.urlencode(post))
response = urllib2.urlopen(settings.BUILDER_UPGRADE_URL,

Просмотреть файл

@ -39,7 +39,7 @@ class TestUpgradeJetpacks(amo.tests.TestCase):
addon = Addon.objects.get(id=3615)
File.objects.all().update(jetpack_version='0.9')
file_ = addon.current_version.all_files[0]
tasks.start_upgrade([file_.id])
tasks.start_upgrade([file_.id], sdk_version='1.2')
assert self.urllib2.urlopen.called
url, args = self.urllib2.urlopen.call_args[0]
args = dict(urlparse.parse_qsl(args))
@ -51,6 +51,7 @@ class TestUpgradeJetpacks(amo.tests.TestCase):
'location': file_.get_url_path('builder'),
'uuid': args['uuid'], # uuid is random so steal from args.
'pingback': absolutify(reverse('amo.builder-pingback')),
'sdk_version': '1.2',
})
eq_(url, settings.BUILDER_UPGRADE_URL)

Просмотреть файл

@ -353,7 +353,7 @@ def start_upgrade(minver, maxver):
ids = [f.id for f in jetpacks if f.needs_upgrade]
log.info('Starting a jetpack upgrade to %s [%s files].'
% (maxver, len(ids)))
files.tasks.start_upgrade.delay(ids)
files.tasks.start_upgrade.delay(ids, sdk_version=maxver)
@login_required