Merge lp:~facundo/ubuntuone-client/aq-log-hostport-ok into lp:ubuntuone-client

[Facundo Batista]

Log the real host:port to which just connected (LP: #693456).

Log the real host:port to which just connected.

Test included

[dobey (dobey)]

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-04-08 19:51:31 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-04-08 20:31:42 +0000
@@ -1237,6 +1237,20 @@
 
         yield self._disconnect_factory()
 
+    def test_connection_started_logging(self):
+        """Test that the connection started logs connector info, not AQ's."""
+        assert self.action_queue.host == '127.0.0.1'
+        assert self.action_queue.port == 0
+
+        class FakeConnector(object):
+            """Fake connector."""
+            host = '1.2.3.4'
+            port = 4321
+
+        self.action_queue.startedConnecting(FakeConnector())
+        self.assertTrue(self.handler.check_info("Connection started",
+                                                "host 1.2.3.4", "port 4321"))
+
 
 class NetworkmanagerTestCase(FactoryBaseTestCase):
     """Base test case generating a connected factory."""

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-04-08 19:51:31 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2011-04-08 20:31:42 +0000
@@ -819,7 +819,7 @@
     def startedConnecting(self, connector):
         """Called when a connection has been started."""
         logger.info('Connection started to host %s, port %s.',
-                    self.host, self.port)
+                    connector.host, connector.port)
 
     def disconnect(self):
         """Disconnect the client.