Merge lp:~jml/launchpad/atexit-warning into lp:launchpad

[Jonathan Lange]

Prevent the atexit warning that occurs when tests are run within the LibrarianLayer.

I'm sick of the atexit warning about the librarian teardown. This patch stops it.

[Robert Collins (lifeless)]

I don't quite follow this, but it makes me nervous. How about removing
the atexit call instead.

[Robert Collins (lifeless)]

I think you want to None out cls._atexit_call too, and perhaps not it in the class scope as other cls variables are:
        _atexit_call = None

-Rob

review: Approve

=== modified file 'lib/canonical/librarian/testing/server.py'
--- lib/canonical/librarian/testing/server.py	2010-09-27 02:08:32 +0000
+++ lib/canonical/librarian/testing/server.py	2010-10-26 20:58:00 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Fixture for the librarians."""
@@ -11,9 +11,9 @@
     'LibrarianTestSetup',
     ]
 
+import atexit
 import os
 import shutil
-import tempfile
 import warnings
 
 from fixtures import Fixture
@@ -24,7 +24,6 @@
     get_pid_from_file,
     TacException,
     TacTestSetup,
-    two_stage_kill,
     )
 from canonical.librarian.storage import _relFileLocation
 

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2010-10-22 09:49:44 +0000
+++ lib/canonical/testing/layers.py	2010-10-26 20:58:00 +0000
@@ -623,6 +623,8 @@
 
     _is_setup = False
 
+    _atexit_call = None
+
     @classmethod
     @profiled
     def setUp(cls):
@@ -635,7 +637,7 @@
         the_librarian = LibrarianTestSetup()
         the_librarian.setUp()
         LibrarianLayer._check_and_reset()
-        atexit.register(the_librarian.tearDown)
+        cls._atexit_call = atexit.register(the_librarian.tearDown)
 
     @classmethod
     @profiled
@@ -650,6 +652,11 @@
                     )
         LibrarianLayer._check_and_reset()
         LibrarianTestSetup().tearDown()
+        # Remove the atexit handler, since we've already done the work.
+        atexit._exithandlers = [
+            handler for handler in atexit._exithandlers
+            if handler[0] != cls._atexit_call]
+        cls._atexit_call = None
 
     @classmethod
     @profiled