Merge lp:~jml/launchpad/run-code-tests-in-db-layer into lp:launchpad

[Jonathan Lange]

[Jonathan Lange (jml)]

This branch makes most of the code doc tests use the DatabaseFunctionalLayer, rather than the LaunchpadFunctionalLayer.

[Robert Collins (lifeless)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jonathan Lange wrote:
> Jonathan Lange has proposed merging lp:~jml/launchpad/run-code-tests-in-db-layer into lp:launchpad/devel.
>
> Requested reviews:
> Canonical Launchpad Engineering (launchpad)
>
> This branch makes most of the code doc tests use the DatabaseFunctionalLayer, rather than the LaunchpadFunctionalLayer.

For my edification; how much faster is this?

- -Rob

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkqc324ACgkQ42zgmrPGrq7ORwCgpVrgt0jwwxEJKIfGWaUx5TET
6NEAoIdSxMynM5IMEEJUJUCX71LtNJqv
=d2l4
-----END PGP SIGNATURE-----

[Graham Binns (gmb)]

review: Approve

[Jonathan Lange (jml)]

On Tue, Sep 1, 2009 at 6:48 PM, Robert Collins<email address hidden> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Jonathan Lange wrote:
>> Jonathan Lange has proposed merging lp:~jml/launchpad/run-code-tests-in-db-layer into lp:launchpad/devel.
>>
>> Requested reviews:
>>     Canonical Launchpad Engineering (launchpad)
>>
>> This branch makes most of the code doc tests use the DatabaseFunctionalLayer, rather than the LaunchpadFunctionalLayer.
>
> For my edification; how much faster is this?
>

For running the total suite, my tests say 2 minutes slower, but that
may be noise.

For running any particular lp.code doctest, 10 seconds faster.

jml

=== modified file 'lib/lp/code/tests/test_doc.py'
--- lib/lp/code/tests/test_doc.py	2009-06-30 16:56:07 +0000
+++ lib/lp/code/tests/test_doc.py	2009-09-01 06:13:55 +0000
@@ -10,12 +10,12 @@
 from zope.security.management import setSecurityPolicy
 
 from canonical.launchpad.testing.systemdocs import (
-    LayeredDocFileSuite, setGlobs, tearDown)
+    LayeredDocFileSuite, setGlobs, setUp, tearDown)
 from canonical.launchpad.ftests.test_system_documentation import (
     branchscannerSetUp)
 from canonical.launchpad.webapp.authorization import LaunchpadSecurityPolicy
-from canonical.testing import LaunchpadZopelessLayer
-
+from canonical.testing import (
+    DatabaseFunctionalLayer, LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
 from lp.services.testing import build_test_suite
 
 
@@ -57,8 +57,16 @@
         setUp=branchscannerSetUp, tearDown=tearDown,
         layer=LaunchpadZopelessLayer
         ),
+    'codeimport-result.txt': LayeredDocFileSuite(
+        '../doc/codeimport-result.txt',
+        setUp=setUp, tearDown=tearDown, layer=LaunchpadFunctionalLayer,
+        ),
+    'branch-merge-proposal-notifications.txt': LayeredDocFileSuite(
+        '../doc/branch-merge-proposal-notifications.txt',
+        setUp=setUp, tearDown=tearDown, layer=LaunchpadFunctionalLayer,
+        ),
     }
 
 
 def test_suite():
-    return build_test_suite(here, special)
+    return build_test_suite(here, special, layer=DatabaseFunctionalLayer)