Merge lp:~dobey/ubuntuone-dev-tools/update-4-0 into lp:ubuntuone-dev-tools/stable-4-0

[dobey]

[Manuel de la Pena]

    Ensure that we only wait for the deferred when a protocol was created server side (LP: #1009408).

[Rodney Dawes]

    Define a method to get the platform-dependent default reactor and use it.
    Avoid using /usr/bin/env python in scripts.

[Eric Casteleijn (thisfred)]

looks ok to me

review: Approve

[Mike McCracken (mikemc)]

agreed

review: Approve

[lp:~dobey/ubuntuone-dev-tools/update-4-0]

75. By Manuel de la Peña on 2012-06-26

[Manuel de la Pena]

    Ensure that we only wait for the deferred when a protocol was created server side (LP: #1009408).

[Rodney Dawes]

    Define a method to get the platform-dependent default reactor and use it.
    Avoid using /usr/bin/env python in scripts.

=== modified file 'bin/u1lint'
--- bin/u1lint	2012-03-30 17:44:03 +0000
+++ bin/u1lint	2012-06-26 20:46:38 +0000
@@ -1,8 +1,4 @@
 #!/usr/bin/python
-
-# u1lint: Wrapper script for pylint or pyflakes
-#
-# Author: Rodney Dawes <[e-mail]>
 #
 # Copyright 2009-2012 Canonical Ltd.
 #
@@ -147,7 +143,7 @@
         config.read([PYLINTRC])
 
         # pylint: disable=E1103
-        return [os.path.join(SRCDIR, item) for item in \
+        return [os.path.join(SRCDIR, item) for item in
                     config.get("MASTER", "ignore").split(",")]
     except (TypeError, ConfigParser.NoOptionError):
         return []
@@ -217,7 +213,7 @@
     failed = False
     ignored = _read_pylintrc_ignored()
     if options.ignored:
-        ignored.extend([os.path.join(SRCDIR, item) for item in \
+        ignored.extend([os.path.join(SRCDIR, item) for item in
                             map(str.strip, options.ignored.split(','))])
 
     if os.environ.get('USE_PYFLAKES'):

=== modified file 'bin/u1trial'
--- bin/u1trial	2012-04-25 20:11:12 +0000
+++ bin/u1trial	2012-06-26 20:46:38 +0000
@@ -1,8 +1,4 @@
-#!/usr/bin/env python
-
-# u1trial: Test runner for Python unit tests needing DBus
-#
-# Author: Rodney Dawes <[e-mail]>
+#!/usr/bin/python
 #
 # Copyright 2009-2012 Canonical Ltd.
 #
@@ -224,6 +220,14 @@
         return result
 
 
+def _get_default_reactor():
+    """Return the platform-dependent default reactor to use."""
+    default_reactor = 'gi'
+    if sys.platform in ['darwin', 'win32']:
+        default_reactor = 'twisted'
+    return default_reactor
+
+
 class Options(trial.Options):
     """Class for options handling."""
 
@@ -236,7 +240,7 @@
                      ["loop", None, 1],
                      ["ignore-modules", "i", ""],
                      ["ignore-paths", "p", ""],
-                     ["reactor", "r", "gi"],
+                     ["reactor", "r", _get_default_reactor()],
                      ]
 
     def __init__(self):

=== modified file 'run-tests'
--- run-tests	2012-04-24 16:37:39 +0000
+++ run-tests	2012-06-26 20:46:38 +0000
@@ -1,7 +1,6 @@
 #!/bin/bash
-# Author: Natalia Bidart <[e-mail]>
 #
-# Copyright 2010-2011 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -16,10 +15,12 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 set -e
 
-bin/u1trial -i "test_squid_windows.py" -c ubuntuone
-bin/u1trial --reactor=twisted -i "test_squid_windows.py" ubuntuone
+PYTHON="python"
+
+$PYTHON bin/u1trial -i "test_squid_windows.py" -c ubuntuone
+$PYTHON bin/u1trial --reactor=twisted -i "test_squid_windows.py" ubuntuone
 echo "Running style checks..."
-bin/u1lint
+$PYTHON bin/u1lint
 pep8 --repeat . bin/* --exclude=*.bat
 rm -rf _trial_temp
 rm -rf .coverage

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-30 11:03:04 +0000
+++ run-tests.bat	2012-06-26 20:46:38 +0000
@@ -29,12 +29,11 @@
 @ECHO off
 
 SET IGNORED="test_squid_linux.py"
+SET LINTIGNORED="ubuntuone\devtools\services\dbus.py,ubuntuone\devtools\services\tests\test_squid_linux.py"
 
 ECHO Checking for Python on the path
 :: Look for Python from buildout
 FOR %%A in (python.exe) do (SET PYTHONEXEPATH=%%~$PATH:A)
-FOR %%B in (u1trial) do (SET TRIALPATH=%%~$PATH:B)
-FOR %%C in (u1lint) do (SET LINTPATH=%%~$PATH:C)
 FOR %%D in (pep8.exe) do (SET PEP8PATH=%%~$PATH:D)
 
 IF NOT "%PYTHONEXEPATH%" == "" GOTO :PYTHONPRESENT
@@ -69,16 +68,16 @@
 
 ECHO Python found at %PYTHONEXEPATH%, executing the tests...
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%" bin/u1trial --reactor=twisted -i %IGNORED% -c %PARAMS% ubuntuone
+"%PYTHONEXEPATH%" bin/u1trial -i %IGNORED% -c %PARAMS% ubuntuone
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks
     GOTO :CLEAN)
 
-"%PYTHONEXEPATH%" "%LINTPATH%" 
+"%PYTHONEXEPATH%" bin/u1lint -i %LINTIGNORED%
 :: test for style if we can, if pep8 is not present, move to the end
 IF NOT EXIST "%PEP8PATH%" GOTO :NOPEP8
-START "Pep8" /B "%PEP8PATH%" --repeat
+START "Pep8" /B "%PEP8PATH%" --repeat .
 :NOPEP8
 ECHO Style checks were not done
 :CLEAN

=== modified file 'setup.py'
--- setup.py	2012-06-05 17:05:51 +0000
+++ setup.py	2012-06-26 20:46:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # Copyright 2010-2012 Canonical Ltd.
 #

=== modified file 'ubuntuone/devtools/services/squid.py'
--- ubuntuone/devtools/services/squid.py	2012-04-26 14:52:43 +0000
+++ ubuntuone/devtools/services/squid.py	2012-06-26 20:46:38 +0000
@@ -113,7 +113,9 @@
         win32api.TerminateProcess(handle, 0)
         win32api.CloseHandle(handle)
     else:
+        # pylint: disable=E1101
         kill(squid_pid, signal.SIGKILL)
+        # pylint: enable=E1101
 
 
 def _make_random_string(count):

=== modified file 'ubuntuone/devtools/testcases/__init__.py'
--- ubuntuone/devtools/testcases/__init__.py	2012-05-14 14:29:25 +0000
+++ ubuntuone/devtools/testcases/__init__.py	2012-06-26 20:46:38 +0000
@@ -63,7 +63,7 @@
 
     def decorator(test_item):
         """Decorate the test so that it is skipped."""
-        if not (isinstance(test_item, type) and\
+        if not (isinstance(test_item, type) and
             issubclass(test_item, TestCase)):
 
             @wraps(test_item)

=== modified file 'ubuntuone/devtools/testcases/tests/test_txsocketserver.py'
--- ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2012-04-26 14:16:33 +0000
+++ ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2012-06-26 20:46:38 +0000
@@ -289,7 +289,7 @@
     def test_deferreds(self):
         """Test that the deferreds are not broken."""
         self.assertFalse(self.client_disconnected.called)
-        self.assertFalse(self.server_disconnected.called)
+        self.assertEqual(None, self.server_disconnected)
 
     @defer.inlineCallbacks
     def test_addition(self):

=== modified file 'ubuntuone/devtools/testcases/txsocketserver.py'
--- ubuntuone/devtools/testcases/txsocketserver.py	2012-05-22 14:19:19 +0000
+++ ubuntuone/devtools/testcases/txsocketserver.py	2012-06-26 20:46:38 +0000
@@ -37,7 +37,7 @@
 
 from ubuntuone.devtools.testcases import BaseTestCase
 
-# no init method +  twisted common warnings
+# no init method + twisted common warnings
 # pylint: disable=W0232, C0103, E1101
 
 
@@ -64,6 +64,25 @@
     return ServerTidyProtocol
 
 
+def server_factory_factory(cls):
+    """Factory that creates special types of factories for tests."""
+
+    if cls is None:
+        cls = protocol.ServerFactory
+
+    class TidyServerFactory(cls):
+        """A tidy factory."""
+
+        testserver_on_connection_lost = None
+
+        def buildProtocol(self, addr):
+            prot = cls.buildProtocol(self, addr)
+            self.testserver_on_connection_lost = defer.Deferred()
+            return prot
+
+    return TidyServerFactory
+
+
 def client_protocol_factory(cls):
     """Factory to create tidy protocols."""
 
@@ -75,13 +94,13 @@
 
         def connectionLost(self, *a):
             """Connection list."""
-            # pylint: disable=W0212
-            if (self.factory._disconnecting
-                    and self.factory.testserver_on_connection_lost is not None
-                    and not self.factory.testserver_on_connection_lost.called):
-                self.factory.testserver_on_connection_lost.callback(self)
-            # pylint: enable=W0212
             cls.connectionLost(self, *a)
+            # pylint: disable=W0212
+            if (self.factory._disconnecting
+                    and self.factory.testserver_on_connection_lost is not None
+                    and not self.factory.testserver_on_connection_lost.called):
+                self.factory.testserver_on_connection_lost.callback(self)
+            # pylint: enable=W0212
 
     return ClientTidyProtocol
 
@@ -120,9 +139,9 @@
     def listen_server(self, server_class, *args, **kwargs):
         """Start a server in a random port."""
         from twisted.internet import reactor
-        self.server_factory = server_class(*args, **kwargs)
+        tidy_class = server_factory_factory(server_class)
+        self.server_factory = tidy_class(*args, **kwargs)
         self.server_factory._disconnecting = False
-        self.server_factory.testserver_on_connection_lost = defer.Deferred()
         self.server_factory.protocol = server_protocol_factory(
                                                  self.server_factory.protocol)
         endpoint = endpoints.serverFromString(reactor,
@@ -161,15 +180,21 @@
             # clean client and server
             self.server_factory._disconnecting = True
             self.client_factory._disconnecting = True
+            d = defer.maybeDeferred(self.listener.stopListening)
             self.connector.transport.loseConnection()
-            d = defer.maybeDeferred(self.listener.stopListening)
-            return defer.gatherResults([d,
-                self.client_factory.testserver_on_connection_lost,
-                self.server_factory.testserver_on_connection_lost])
+            if self.server_factory.testserver_on_connection_lost:
+                return defer.gatherResults([d,
+                    self.client_factory.testserver_on_connection_lost,
+                    self.server_factory.testserver_on_connection_lost])
+            else:
+                return defer.gatherResults([d,
+                    self.client_factory.testserver_on_connection_lost])
         if self.listener:
             # just clean the server since there is no client
+            # pylint: disable=W0201
             self.server_factory._disconnecting = True
             return defer.maybeDeferred(self.listener.stopListening)
+            # pylint: enable=W0201
 
 
 class TidyTCPServer(TidySocketServer):