pkgme service

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

  1. bump-pkgme-devportal
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 146
Merged at revision: 142
Proposed branch: lp:~jml/pkgme-service/bump-pkgme-devportal
Merge into: lp: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:~jml/pkgme-service/bump-pkgme-devportal
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+134489@code.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
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2012-10-30 18:23:06 +0000
3+++ buildout.cfg 2012-11-15 15:48:19 +0000
4@@ -44,5 +44,6 @@
5 twisted
6 txpkgme
7 pkgme-service-python
8+ libdep-service[testing]
9 include-site-packages = false
10 interpreter = py
11
12=== modified file 'setup.py'
13--- setup.py 2012-10-30 18:23:06 +0000
14+++ setup.py 2012-11-15 15:48:19 +0000
15@@ -26,7 +26,7 @@
16 'python-openid==2.2.5',
17 'django-preflight==0.1',
18 'oops==0.0.10',
19- 'oops_datedir_repo==0.0.15',
20+ 'oops_datedir_repo==0.0.17',
21 'oops_celery==0.0.1',
22 'oops_dictconfig==0.0.1',
23 'oops_wsgi==0.0.10',
24
25=== modified file 'src/djpkgme/tests/factory.py'
26--- src/djpkgme/tests/factory.py 2012-09-12 14:33:28 +0000
27+++ src/djpkgme/tests/factory.py 2012-11-15 15:48:19 +0000
28@@ -24,6 +24,12 @@
29 os.path.dirname(acceptance.__file__), 'data', *segments)
30
31
32+DEPENDENCIES_FOR_TEST_DATA = [
33+ ("pthreads", {'i386': {"libpthread.so.0": "libpthread0"}}),
34+ ("eglibc", {'i386': {"libc.so.6": "libc6"}}),
35+ ]
36+
37+
38 class PkgmeObjectFactory(Fixture):
39 """A factory for creating model objects for tests."""
40
41@@ -105,12 +111,6 @@
42 tagline=self.get_unique_string('tagline'),
43 )
44
45- def add_dependencies_for_test_data(self, pkg_db):
46- """Add the library dependencies needed for the test data."""
47- pkg_db.db.update_package(
48- "pthreads", {'i386': {"libpthread.so.0": "libpthread0"}})
49- pkg_db.db.update_package("eglibc", {'i386': {"libc.so.6": "libc6"}})
50-
51
52 class DjangoRunner(RunTest):
53 """Use with run_tests_with to run Django tests.
54
55=== modified file 'src/djpkgme/tests/test_integration.py'
56--- src/djpkgme/tests/test_integration.py 2012-10-26 11:22:13 +0000
57+++ src/djpkgme/tests/test_integration.py 2012-11-15 15:48:19 +0000
58@@ -3,6 +3,7 @@
59 import subprocess
60 import sys
61
62+from devportalbinary.testing import LibdepFixture
63 from djangofixture import DjangoFixture
64 from fixtures import (
65 EnvironmentVariableFixture,
66@@ -22,12 +23,12 @@
67 Equals,
68 )
69
70-from devportalbinary.testing import DatabaseFixture
71 from pkgme_service_client import PkgmeAPI
72 from txpkgme.harness import PkgmeServiceError
73 from txpkgme.submitfromdisk import submit_local_files
74
75 from djpkgme.tests.factory import (
76+ DEPENDENCIES_FOR_TEST_DATA,
77 get_acceptance_data_path,
78 TestCaseWithFactory,
79 )
80@@ -224,9 +225,7 @@
81 tarball_path = self.factory.make_tarball(
82 get_acceptance_data_path('gtk'))
83
84- pkg_db = self.useFixture(DatabaseFixture())
85- self.factory.add_dependencies_for_test_data(pkg_db)
86-
87+ self.useFixture(LibdepFixture(DEPENDENCIES_FOR_TEST_DATA))
88 return self.expect_success(
89 metadata, tarball_path,
90 self.packaged_app_url_equals(
91
92=== modified file 'src/djpkgme/tests/test_tasks.py'
93--- src/djpkgme/tests/test_tasks.py 2012-09-18 12:34:40 +0000
94+++ src/djpkgme/tests/test_tasks.py 2012-11-15 15:48:19 +0000
95@@ -8,6 +8,7 @@
96 import traceback
97
98 from devportalbinary.metadata import MetadataBackend
99+from devportalbinary.testing import LibdepFixture
100 from django.conf import settings
101 from fixtures import TempDir
102 import mock
103@@ -25,7 +26,6 @@
104 )
105 from testtools import TestCase
106
107-from devportalbinary.testing import DatabaseFixture
108 from djpkgme import tasks
109 from djpkgme.tasks import (
110 as_pkgme_dict,
111@@ -39,6 +39,7 @@
112 )
113 from ..client import get_response_dict
114 from djpkgme.tests.factory import (
115+ DEPENDENCIES_FOR_TEST_DATA,
116 PkgmeObjectFactory,
117 TestCaseWithFactory,
118 )
119@@ -394,8 +395,7 @@
120 os.rename(file_path, proper_location)
121 return proper_location
122 self.patch(tasks, 'download_file', download_file)
123- pkg_db = self.useFixture(DatabaseFixture())
124- self.factory.add_dependencies_for_test_data(pkg_db)
125+ self.useFixture(LibdepFixture(DEPENDENCIES_FOR_TEST_DATA))
126 temp_dir = self.useFixture(TempDir()).path
127 self.patch(settings, 'PKGME_OUTPUT_DIRECTORY', temp_dir)
128 return task.build_package(metadata, {})
129
130=== modified file 'versions.cfg'
131--- versions.cfg 2012-10-30 18:23:06 +0000
132+++ versions.cfg 2012-11-15 15:48:19 +0000
133@@ -12,17 +12,19 @@
134 anyjson = 0.3.3
135 argparse = 1.2.1
136 bson = 0.3.3
137+bzr = 2.5.1
138 celery = 2.5.0
139 Cheetah = 2.4.4
140 configglue = 1.0.1
141 distribute = 0.6.30
142-Django = 1.3.1
143+django = 1.3.1
144 djangofixture = 0.1
145 django-celery = 2.5.0
146 django-configglue = 0.6.1
147 django-configglue = 0.6.1
148 django-kombu = 0.9.4
149 django-openid-auth = 0.4
150+django-pgtools = 0.1
151 django-picklefield = 0.2.1
152 django-piston = 0.2.3
153 django-preflight = 0.1
154@@ -35,22 +37,23 @@
155 lazr.authentication = 0.1.2
156 lazr.restfulclient = 0.13.0
157 lazr.uri = 1.0.3
158+libdep-service = 0.6
159 libdep-service-python = 0.0.5
160 Markdown = 2.2.0
161 mock = 0.8.0
162 oauth = 1.0.1
163 oops = 0.0.10
164-oops_celery = 0.0.1
165-oops_datedir_repo = 0.0.15
166-oops_dictconfig = 0.0.1
167-oops_wsgi = 0.0.10
168+oops-celery = 0.0.1
169+oops-datedir-repo = 0.0.17
170+oops-dictconfig = 0.0.1
171+oops-wsgi = 0.0.10
172 paste = 1.7.5.1
173 postgresfixture = 0.1.2
174 PIL = 1.1.7
175 piston-mini-client = 0.7.3
176 pkgme = 0.4.3
177 pkgme-service-python = 0.3
178-pkgme-devportal = 0.4.10
179+pkgme-devportal = 0.5.1
180 psycopg2 = 2.4.5
181 python-dateutil = 1.5
182 python-debian = 0.1.16
183@@ -59,13 +62,14 @@
184 pytz = 2012d
185 pyxdg = 0.23
186 simplejson = 2.6.1
187-South = 0.7.3
188+south = 0.7.3
189 storm = 0.19
190 testresources = 0.2.5
191 testtools = 0.9.21
192 treeshape = 0.2.1
193 twisted = 11.1.0
194 txpkgme = 0.3
195+txstatsd = 1.0.0
196 wadllib = 1.3.1
197 wsgi-intercept = 0.5.1
198 z3c.recipe.filetemplate = 2.2.0

Subscribers

People subscribed via source and target branches