Launchpad itself

Merge lp:~lifeless/launchpad/test into lp:launchpad

  1. test
  2. Merge into devel
Proposed by Robert Collins
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: 11574
Proposed branch: lp:~lifeless/launchpad/test
Merge into: lp:launchpad
Diff against target: 44 lines (+4/-1)
3 files modified
lib/lp/testing/__init__.py (+2/-1)
setup.py (+1/-0)
versions.cfg (+1/-0)
To merge this branch: bzr merge lp:~lifeless/launchpad/test
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+35917@code.launchpad.net

Commit message

Add fixtures as a dependency.

Description of the change

Add the external fixtures project as a dependency; this is pretty similar to our existing facilities but with a few differences:
 - it delegates completely to the fixture
 - the fixtures project is aiming to be a common reference point for several projects (I hope to get zope.testing using it for layer management, for instance)
 - if we migrate across to it we can delete more code from LP.

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py 2010-09-09 17:02:33 +0000
+++ lib/lp/testing/__init__.py 2010-09-18 08:29:51 +0000
@@ -75,6 +75,7 @@
75 format_registry,75 format_registry,
76 )76 )
77from bzrlib.transport import get_transport77from bzrlib.transport import get_transport
78import fixtures
78import pytz79import pytz
79from storm.expr import Variable80from storm.expr import Variable
80from storm.store import Store81from storm.store import Store
@@ -301,7 +302,7 @@
301 debug(False)302 debug(False)
302303
303304
304class TestCase(testtools.TestCase):305class TestCase(testtools.TestCase, fixtures.TestWithFixtures):
305 """Provide Launchpad-specific test facilities."""306 """Provide Launchpad-specific test facilities."""
306307
307 def becomeDbUser(self, dbuser):308 def becomeDbUser(self, dbuser):
308309
=== modified file 'setup.py'
--- setup.py 2010-09-07 18:15:01 +0000
+++ setup.py 2010-09-18 08:29:51 +0000
@@ -31,6 +31,7 @@
31 'cssutils',31 'cssutils',
32 # Required for pydkim32 # Required for pydkim
33 'dnspython',33 'dnspython',
34 'fixtures',
34 'FeedParser',35 'FeedParser',
35 'feedvalidator',36 'feedvalidator',
36 'funkload',37 'funkload',
3738
=== modified file 'versions.cfg'
--- versions.cfg 2010-09-14 15:04:06 +0000
+++ versions.cfg 2010-09-18 08:29:51 +0000
@@ -19,6 +19,7 @@
19epydoc = 3.0.119epydoc = 3.0.1
20FeedParser = 4.120FeedParser = 4.1
21feedvalidator = 0.0.0DEV-r104921feedvalidator = 0.0.0DEV-r1049
22fixtures = 0.3
22functest = 0.8.723functest = 0.8.7
23funkload = 1.10.024funkload = 1.10.0
24grokcore.component = 1.625grokcore.component = 1.6