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
1=== modified file 'lib/lp/testing/__init__.py'
2--- lib/lp/testing/__init__.py 2010-09-09 17:02:33 +0000
3+++ lib/lp/testing/__init__.py 2010-09-18 08:29:51 +0000
4@@ -75,6 +75,7 @@
5 format_registry,
6 )
7 from bzrlib.transport import get_transport
8+import fixtures
9 import pytz
10 from storm.expr import Variable
11 from storm.store import Store
12@@ -301,7 +302,7 @@
13 debug(False)
14
15
16-class TestCase(testtools.TestCase):
17+class TestCase(testtools.TestCase, fixtures.TestWithFixtures):
18 """Provide Launchpad-specific test facilities."""
19
20 def becomeDbUser(self, dbuser):
21
22=== modified file 'setup.py'
23--- setup.py 2010-09-07 18:15:01 +0000
24+++ setup.py 2010-09-18 08:29:51 +0000
25@@ -31,6 +31,7 @@
26 'cssutils',
27 # Required for pydkim
28 'dnspython',
29+ 'fixtures',
30 'FeedParser',
31 'feedvalidator',
32 'funkload',
33
34=== modified file 'versions.cfg'
35--- versions.cfg 2010-09-14 15:04:06 +0000
36+++ versions.cfg 2010-09-18 08:29:51 +0000
37@@ -19,6 +19,7 @@
38 epydoc = 3.0.1
39 FeedParser = 4.1
40 feedvalidator = 0.0.0DEV-r1049
41+fixtures = 0.3
42 functest = 0.8.7
43 funkload = 1.10.0
44 grokcore.component = 1.6