launchpad-reviewers team mailing list archive

[Deryck Hodge <deryck.hodge@xxxxxxxxxxxxx>]

Deryck Hodge has proposed merging lp:~deryck/launchpad/windmill-build-fixes into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~deryck/launchpad/windmill-build-fixes/+merge/55754

This branch re-enables Windmill tests and sets a timeout so to help us better see the tests that are currently hanging in Windmill.  It's not a fix for the issue, but will help us see when this happens.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  buildout-templates/bin/test.in
  lib/canonical/testing/layers.py

./buildout-templates/bin/test.in
     140: Line exceeds 78 characters.
./lib/canonical/testing/layers.py
      87: redefinition of unused 'zope' from line 86
    1212: E301 expected 1 blank line, found 2
    1492: E301 expected 1 blank line, found 2
-- 
https://code.launchpad.net/~deryck/launchpad/windmill-build-fixes/+merge/55754
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~deryck/launchpad/windmill-build-fixes into lp:launchpad.

=== modified file 'buildout-templates/bin/test.in'
--- buildout-templates/bin/test.in	2011-03-01 23:43:17 +0000
+++ buildout-templates/bin/test.in	2011-03-31 13:57:46 +0000
@@ -169,7 +169,7 @@
     'tests_pattern': '^f?tests$',
     'test_path': [${buildout:directory/lib|path-repr}],
     'package': ['canonical', 'lp', 'devscripts', 'launchpad_loggerhead'],
-    'layer': ['!(MailmanLayer|WindmillLayer)'],
+    'layer': ['!(MailmanLayer)'],
     }
 
 # Monkey-patch os.listdir to randomise the results

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2011-03-07 16:32:12 +0000
+++ lib/canonical/testing/layers.py	2011-03-31 13:57:46 +0000
@@ -2038,6 +2038,14 @@
         # belong to Windmill, which will be cleaned up on layer
         # tear down.
         BaseLayer.disable_thread_check = True
+        socket.setdefaulttimeout(120)
+
+    @classmethod
+    @profiled
+    def testTearDown(cls):
+        # To play nice with Windmill layers, we need to reset
+        # the socket timeout default in this method, too.
+        socket.setdefaulttimeout(None)
 
     @classmethod
     def _fixStandardInputFileno(cls):