launchpad-reviewers team mailing list archive

[Deryck Hodge <deryck.hodge@xxxxxxxxxxxxx>]

Deryck Hodge has proposed merging lp:~deryck/launchpad/kill-windmill-test-pain-ftw into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~deryck/launchpad/kill-windmill-test-pain-ftw/+merge/47852

Windmill tests are failing in buildbot and locally with LayerIsolationErrors.  The local one looks like this:

canonical.testing.layers.LayerIsolationError: Test didn't reset the socket default timeout.

which is different than the buildbot one:

canonical.testing.layers.LayerIsolationError: Librarian has been killed or has hung.Tests should use LibrarianLayer.hide() and LibrarianLayer.reveal() where possible, and ensure the Librarian is restarted if it absolutely must be shutdown: [Errno socket error] timed out

But both are happening in the same place, as the first AppWindmillLayer finishes and tries to tear down on the way to the next (the BugsWindmillLayer).

This fixes the local errors and tests are running fine locally again.

Thoughts?


-- 
https://code.launchpad.net/~deryck/launchpad/kill-windmill-test-pain-ftw/+merge/47852
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~deryck/launchpad/kill-windmill-test-pain-ftw into lp:launchpad.

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2010-12-24 12:02:55 +0000
+++ lib/canonical/testing/layers.py	2011-01-28 19:10:26 +0000
@@ -2013,6 +2013,7 @@
             cls.config_file.close()
         config.reloadConfig()
         reset_logging()
+        socket.setdefaulttimeout(None)
 
     @classmethod
     @profiled