Merge lp://qastaging/~jml/pkgme-service/bump-pkgme-devportal into lp://qastaging/pkgme-service

Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 146
Merged at revision: 142
Proposed branch: lp://qastaging/~jml/pkgme-service/bump-pkgme-devportal
Merge into: lp://qastaging/pkgme-service
Diff against target: 198 lines (+25/-21)
6 files modified
buildout.cfg (+1/-0)
setup.py (+1/-1)
src/djpkgme/tests/factory.py (+6/-6)
src/djpkgme/tests/test_integration.py (+3/-4)
src/djpkgme/tests/test_tasks.py (+3/-3)
versions.cfg (+11/-7)
To merge this branch: bzr merge lp://qastaging/~jml/pkgme-service/bump-pkgme-devportal
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+134489@code.qastaging.launchpad.net

Commit message

Upgrade to use latest pkgme-devportal, thus requiring libdep-service double for tests

Description of the change

James is here & has watched what I'm doing.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (12.0 KiB)

The attempt to merge lp:~jml/pkgme-service/bump-pkgme-devportal 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/tmp1m38Ny/.'
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'...

+N dist/libdep-service-0.6.tar.gz
+N dist/pkgme-devportal-0.5.1.tar.gz
All changes applied successfully.
Updated to revision 47 of branch bzr+ssh://bazaar.launchpad.net/+branch/ca-download-cache
zip_safe flag not set; analyzing archive contents...
devportalbinary.testing: module references __file__
devportalbinary.acceptance.tests.__init__: module references __file__
..............................EE..............................
======================================================================
ERROR: test_gtk (djpkgme.tests.test_integration.TestEndToEnd)
djpkgme.tests.test_integration.TestEndToEnd.test_gtk
----------------------------------------------------------------------
_StringException: Empty attachments:
  twisted-log

celery-log: {{{
[2012-11-15 15:44:16,852: 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-15 15:44:16,944: WARNING/MainProcess] <email address hidden> has started.
[2012-11-15 15:44:22,088: INFO/PoolWorker-1] ['tar', '--force-local', '--no-same-owner', '--no-same-permissions', '-xf', u'/tmp/tmpcTOu4H/download/package-name4.tar.gz', '-C', '/tmp/tmpcTOu4H/working'] finished in 0.005s
[2012-11-15 15:44:22,346: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.5.1-py2.7.egg/devportalbinary/backends/python-stub/want'] finished in 0.256s
[2012-11-15 15:44:22,619: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.5.1-py2.7.egg/devportalbinary/backends/diff/want'] finished in 0.272s
[2012-11-15 15:44:22,877: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.5.1-py2.7.egg/devportalbinary/backends/pdf/want'] finished in 0.256s
[2012-11-15 15:44:23,140: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.5.1-py2.7.egg/devportalbinary/backends/deb-bin/want'] finished in 0.262s
[2012-11-15 15:44:23,422: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.5.1-py2.7.egg/devportalbinary/backends/exe/want'] finished in 0.282s
[2012-11-15 15:44:23,687: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.5.1-py2.7.egg/devportalbinary/backends/deb-src/want'] finished in 0.264s
[2012-11-15 15:44:23,946: INFO/PoolWo...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches