Merge into trunk : add-download-file : Code : pkgme service

Status:	Merged
Approved by:	James Westby on 2012-11-13
Approved revision:	141
Merged at revision:	141
Proposed branch:	lp://qastaging/~jml/pkgme-service/add-download-file
Merge into:	lp://qastaging/pkgme-service
Diff against target:	261 lines (+188/-3) 3 files modified src/djpkgme/osutils.py (+80/-0) src/djpkgme/tasks.py (+1/-3) src/djpkgme/tests/test_osutils.py (+107/-0)
To merge this branch:	bzr merge lp://qastaging/~jml/pkgme-service/add-download-file
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Westby (community)		2012-11-13	Approve on 2012-11-13
Review via email: mp+134127@code.qastaging.launchpad.net

Commit message

Add download_file from pkgme-devportal

Description of the change

I wrote a useful message here before, but the Internet ate it.

pkgme-service uses download_file, but pkgme-devportal does not. This branch
copies download_file into pkgme-service so it can be removed from devportalbinary.

Revision history for this message

James Westby (james-w) on 2012-11-13:

#

review: Approve

Revision history for this message

ISD Branch Mangler (isd-branches-mangler) wrote on 2012-11-13:

#

Download full text (6.1 KiB)

The attempt to merge lp:~jml/pkgme-service/add-download-file into lp:pkgme-service failed. Below is the output from the failed tests.

python2.7 bootstrap.py --distribute --version 1.5.1 \
--download-base=download-cache/dist --eggs=eggs \
--setup-source distribute_setup.py
touch --no-create bin/buildout
./bin/buildout
Develop: '/tmp/tmpHkM6lC/.'
Updating scripts.
Updating filetemplates.
touch --no-create bin/py
./bin/py django_project/manage.py test djpkgme
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

Tree is up to date at revision 44 of branch bzr+ssh://bazaar.launchpad.net/+branch/ca-download-cache
..............................E...............................
======================================================================
ERROR: test_gtk (djpkgme.tests.test_integration.TestEndToEnd)
djpkgme.tests.test_integration.TestEndToEnd.test_gtk
----------------------------------------------------------------------
_StringException: Empty attachments:
twisted-log

celery-log: {{{
[2012-11-13 22:31:00,675: WARNING/MainProcess] -------------- <email address hidden> v2.5.0
---- **** -----
--- * *** * -- [Configuration]
-- * - **** --- . broker: djkombu.transport.DatabaseTransport:////
- ** ---------- . loader: djcelery.loaders.DjangoLoader
- ** ---------- . logfile: <email address hidden>@WARNING
- ** ---------- . concurrency: 1
- ** ---------- . events: ON
- *** --- * --- . beat: OFF
-- ******* ----
--- ***** ----- [Queues]
-------------- . celery: exchange:celery (direct) binding:celery
[2012-11-13 22:31:00,687: WARNING/MainProcess] <email address hidden> has started.
[2012-11-13 22:31:06,258: INFO/PoolWorker-1] ['tar', '--force-local', '--no-same-owner', '--no-same-permissions', '-xf', u'/tmp/tmp7kivhZ/download/package-name4.tar.gz', '-C', '/tmp/tmp7kivhZ/working'] finished in 0.445s
[2012-11-13 22:31:07,815: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/python-stub/want'] finished in 1.555s
[2012-11-13 22:31:09,035: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/diff/want'] finished in 1.220s
[2012-11-13 22:31:09,937: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/pdf/want'] finished in 0.900s
[2012-11-13 22:31:11,504: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-bin/want'] finished in 1.567s
[2012-11-13 22:31:13,235: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/exe/want'] finished in 1.730s
[2012-11-13 22:31:14,021: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-src/want'] finished in 0.785s
[2012-11-13 22:31:15,127: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/text/want'] finished in 1.106s
[2012-11-13 22:31:17,969: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/image/want'] finished in 2.840s
[2012-11-13 ...

The attempt to merge lp:~jml/pkgme-service/add-download-file into lp:pkgme-service failed. Below is the output from the failed tests.

python2.7 bootstrap.py --distribute --version 1.5.1 \
				--download-base=download-cache/dist --eggs=eggs \
				--setup-source distribute_setup.py
touch --no-create bin/buildout
./bin/buildout
Develop: '/tmp/tmpHkM6lC/.'
Updating scripts.
Updating filetemplates.
touch --no-create bin/py
./bin/py django_project/manage.py test djpkgme
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

Tree is up to date at revision 44 of branch bzr+ssh://bazaar.launchpad.net/+branch/ca-download-cache
..............................E...............................
======================================================================
ERROR: test_gtk (djpkgme.tests.test_integration.TestEndToEnd)
djpkgme.tests.test_integration.TestEndToEnd.test_gtk
----------------------------------------------------------------------
_StringException: Empty attachments:
  twisted-log

celery-log: {{{
[2012-11-13 22:31:00,675: WARNING/MainProcess] -------------- celery@test-64277776.server-4226a987-b7d4-4140-995e-ce178d47c80c v2.5.0
---- **** -----
--- * ***  * -- [Configuration]
-- * - **** ---   . broker:      djkombu.transport.DatabaseTransport:////
- ** ----------   . loader:      djcelery.loaders.DjangoLoader
- ** ----------   . logfile:     celeryd@test-64277776.log@WARNING
- ** ----------   . concurrency: 1
- ** ----------   . events:      ON
- *** --- * ---   . beat:        OFF
-- ******* ----
--- ***** ----- [Queues]
 --------------   . celery:      exchange:celery (direct) binding:celery
[2012-11-13 22:31:00,687: WARNING/MainProcess] celery@test-64277776.server-4226a987-b7d4-4140-995e-ce178d47c80c has started.
[2012-11-13 22:31:06,258: INFO/PoolWorker-1] ['tar', '--force-local', '--no-same-owner', '--no-same-permissions', '-xf', u'/tmp/tmp7kivhZ/download/package-name4.tar.gz', '-C', '/tmp/tmp7kivhZ/working'] finished in 0.445s
[2012-11-13 22:31:07,815: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/python-stub/want'] finished in 1.555s
[2012-11-13 22:31:09,035: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/diff/want'] finished in 1.220s
[2012-11-13 22:31:09,937: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/pdf/want'] finished in 0.900s
[2012-11-13 22:31:11,504: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-bin/want'] finished in 1.567s
[2012-11-13 22:31:13,235: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/exe/want'] finished in 1.730s
[2012-11-13 22:31:14,021: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-src/want'] finished in 0.785s
[2012-11-13 22:31:15,127: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/text/want'] finished in 1.106s
[2012-11-13 22:31:17,969: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/image/want'] finished in 2.840s
[2012-11-13 22:31:21,255: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/shell/want'] finished in 3.285s
[2012-11-13 22:31:22,083: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/desktop/want'] finished in 0.827s
[2012-11-13 22:31:23,132: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/jar/want'] finished in 1.048s
[2012-11-13 22:31:23,436: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/binary/want'] finished in 0.303s
}}}

celery-startup-log: {{{
[1;36mceleryd-multi v2.5.0[0m
> Starting nodes...
	> test-64277776.server-4226a987-b7d4-4140-995e-ce178d47c80c: [1;32mOK[0m
}}}

django-settings: {{{
MULTILANG_OP_ENDPOINTS = False
MYAPPS_BASE_URL = ''
BROKER_USER = ''
PKGME_LOG_DIR = '.'
SITE_ID = 1
OPENID_SREG_REQUIRED_FIELDS = ['email', 'nickname']
MYAPPS_REALM = 'Pkgme'
OPENID_LAUNCHPAD_STAFF_TEAMS = ['canonical-ca-hackers', 'canonical-losas']
OOPSES = {'publishers': [{'error_dir': 'oopses', 'exchange_name': '', 'routing_key': '', 'instance_id': 'dev', 'vhost': '', 'host': '', 'user': '', 'new_only': '', 'password': '', 'type': 'datedir'}]}
ROOT_URLCONF = 'django_project.urls'
CELERYD_TASK_TIME_LIMIT = 120
OPENID_LAUNCHPAD_TEAMS_MAPPING = {'canonical-losas': 'admin', 'canonical-ca-hackers': 'admin'}
PKGME_MAINTAINER_EMAIL = 'pkgme-service bot <ca-pkgme-service-bot@canonical.com>'
CELERY_DISABLE_RATE_LIMITS = True
OPENID_SREG_EXTRA_FIELDS = ['language']
OPENID_CREATE_USERS = True
BROKER_VHOST = ''
PKGME_OUTPUT_DIRECTORY = '/tmp/tmpxsEBDJ'
EXTRA_INSTALLED_APPS = []
BROKER_PASSWORD = ''
MYAPPS_CONSUMER_KEY = 'pkgme-service-dev-consumer-key'
OPENID_SSO_SERVER_URL = 'https://login.ubuntu.com/'
CACHE_BACKEND = 'locmem://'
SETTINGS_MODULE = 'django_project.settings'
SETTINGS_ENCODING = 'utf-8'
OPENID_UPDATE_DETAILS_FROM_SREG = True
BROKER_HOST = ''
BROKER_PORT = 0
MYAPPS_TOKEN_SECRET = 'pkgme-service-dev-token-secret'
PKGME_OUTPUT_URL = 'http://localhost:8001/+output'
PKGME_ALLOWED_BACKENDS = ['binary', 'pdf', 'deb-bin', 'deb-src', 'desktop', 'diff', 'exe', 'image', 'jar', 'python-stub', 'shell', 'text']
MYAPPS_TOKEN = 'pkgme-service-dev-token'
MYAPPS_CONSUMER_SECRET = 'pkgme-service-dev-consumer-secret'
BROKER_BACKEND = 'djkombu.transport.DatabaseTransport'
}}}

syncdb-log: {{{
Syncing...
Creating tables ...
Installing custom SQL ...
Installing indexes ...
No fixtures found.

Synced:
 > django.contrib.auth
 > django.contrib.contenttypes
 > django.contrib.sessions
 > django.contrib.sites
 > django.contrib.messages
 > django.contrib.staticfiles
 > django.contrib.admin
 > piston
 > djpkgme
 > south
 > django_configglue
 > preflight
 > djkombu
 > django_openid_auth

Not synced (use migrations):
 - djcelery
(use ./manage.py migrate to migrate these)
}}}

TimeoutError: User timeout caused connection failure.

----------------------------------------------------------------------
Ran 62 tests in 93.906s

FAILED (errors=1)
make: *** [test] Error 1

pkgme service

Merge lp://qastaging/~jml/pkgme-service/add-download-file into lp://qastaging/pkgme-service

Commit message

Description of the change

Preview Diff

Subscribers