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

[Robert Collins]

Make memcache/database/librarian layers tolerant of being torn down twice to cater to zope.testrunner layer behaviour.

[Henning Eggers (henninge)]

Simple enough fix, thank you, but can you please rename _setup to _is_setup or _is_set_up?

review: Approve (code)

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2010-10-04 06:20:04 +0000
+++ lib/canonical/testing/layers.py	2010-10-05 08:51:00 +0000
@@ -482,9 +482,12 @@
     # memcached.
     _memcached_process = None
 
+    _is_setup = False
+
     @classmethod
     @profiled
     def setUp(cls):
+        cls._is_setup = True
         # Create a client
         MemcachedLayer.client = memcache_client_factory()
         if (BaseLayer.persist_test_services and
@@ -531,6 +534,9 @@
     @classmethod
     @profiled
     def tearDown(cls):
+        if not cls._is_setup:
+            return
+        cls._is_setup = False
         MemcachedLayer.client.disconnect_all()
         MemcachedLayer.client = None
         if not BaseLayer.persist_test_services:
@@ -568,9 +574,12 @@
     """
     _reset_between_tests = True
 
+    _is_setup = False
+
     @classmethod
     @profiled
     def setUp(cls):
+        cls._is_setup = True
         if not LibrarianLayer._reset_between_tests:
             raise LayerInvariantError(
                     "_reset_between_tests changed before LibrarianLayer "
@@ -584,6 +593,9 @@
     @classmethod
     @profiled
     def tearDown(cls):
+        if not cls._is_setup:
+            return
+        cls._is_setup = False
         if not LibrarianLayer._reset_between_tests:
             raise LayerInvariantError(
                     "_reset_between_tests not reset before LibrarianLayer "
@@ -680,9 +692,12 @@
     # Database.force_dirty_database() when you do so.
     _reset_between_tests = True
 
+    _is_setup = False
+
     @classmethod
     @profiled
     def setUp(cls):
+        cls._is_setup = True
         DatabaseLayer.force_dirty_database()
         # Imported here to avoid circular import issues. This
         # functionality should be migrated into this module at some
@@ -695,6 +710,9 @@
     @classmethod
     @profiled
     def tearDown(cls):
+        if not cls._is_setup:
+            return
+        cls._is_setup = False
         # Don't leave the DB lying around or it might break tests
         # that depend on it not being there on startup, such as found
         # in test_layers.py