Merge lp:~jml/pkgme-service/add-download-file into lp:pkgme-service
Proposed by
Jonathan Lange
Status: | Merged |
---|---|
Approved by: | James Westby |
Approved revision: | 141 |
Merged at revision: | 141 |
Proposed branch: | lp:~jml/pkgme-service/add-download-file |
Merge into: | lp: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:~jml/pkgme-service/add-download-file |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby (community) | Approve | ||
Review via email: mp+134127@code.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.
To post a comment you must log in.
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 \ base=download- cache/dist --eggs=eggs \ project/ manage. py test djpkgme
--download-
--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_
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.... ....... ....... ....... ...... ======= ======= ======= ======= ======= ======= ======= ======= ======= tests.test_ integration. TestEndToEnd) tests.test_ integration. TestEndToEnd. test_gtk ------- ------- ------- ------- ------- ------- ------- ------- -------
.......
=======
ERROR: test_gtk (djpkgme.
djpkgme.
-------
_StringException: Empty attachments:
twisted-log
celery-log: {{{ MainProcess] -------------- <email address hidden> v2.5.0 transport. DatabaseTranspo rt://// loaders. DjangoLoader MainProcess] <email address hidden> has started. permissions' , '-xf', u'/tmp/ tmp7kivhZ/ download/ package- name4.tar. gz', '-C', '/tmp/tmp7kivhZ /working' ] finished in 0.445s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ python- stub/want' ] finished in 1.555s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ diff/want' ] finished in 1.220s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ pdf/want' ] finished in 0.900s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ deb-bin/ want'] finished in 1.567s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ exe/want' ] finished in 1.730s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ deb-src/ want'] finished in 0.785s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ text/want' ] finished in 1.106s eggs/pkgme_ devportal- 0.4.10- py2.7.egg/ devportalbinary /backends/ image/want' ] finished in 2.840s
[2012-11-13 22:31:00,675: WARNING/
---- **** -----
--- * *** * -- [Configuration]
-- * - **** --- . broker: djkombu.
- ** ---------- . loader: djcelery.
- ** ---------- . 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/
[2012-11-13 22:31:06,258: INFO/PoolWorker-1] ['tar', '--force-local', '--no-same-owner', '--no-same-
[2012-11-13 22:31:07,815: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 22:31:09,035: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 22:31:09,937: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 22:31:11,504: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 22:31:13,235: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 22:31:14,021: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 22:31:15,127: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 22:31:17,969: INFO/PoolWorker-1] ['/tmp/
[2012-11-13 ...