Merge lp:~thomir-deactivatedaccount/autopilot/1.3-fix-warning into lp:autopilot/1.3

[Thomi Richards]

Remove a spurious log message.

Remove a log message when we try and get the process Id for the dbus daemon itself.

[Martin Pitt (pitti)]

Ack. I'm not a big fan of the extra empty line in the docstring, but it's broken either way (no single-line short description), so no reason to block the merge on just that.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~thomir/autopilot/1.3-fix-warning/+merge/186640/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:335
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~thomir/autopilot/1.3-fix-warning/+merge/186640/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-1.3-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-1.3-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-1.3-autolanding/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-amd64-autolanding/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-armhf-autolanding/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-i386-autolanding/5/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/autopilot-1.3-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-1.3-ci/22/rebuild

review: Approve (continuous-integration)

=== modified file 'autopilot/introspection/__init__.py'
--- autopilot/introspection/__init__.py	2013-09-17 18:50:07 +0000
+++ autopilot/introspection/__init__.py	2013-09-20 12:54:31 +0000
@@ -393,7 +393,11 @@
 
 def _connection_matches_pid(bus, connection_name, pid):
     """Given a PID checks wherever it or its children are connected on this
-    bus."""
+    bus.
+
+    """
+    if connection_name == 'org.freedesktop.DBus':
+        return False
     try:
         if _bus_pid_is_our_pid(bus, connection_name, pid):
             return False

=== modified file 'autopilot/tests/functional/test_introspection_features.py'
--- autopilot/tests/functional/test_introspection_features.py	2013-07-14 09:22:48 +0000
+++ autopilot/tests/functional/test_introspection_features.py	2013-09-20 12:54:31 +0000
@@ -17,7 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from dbus import SessionBus
 import json
+from mock import patch
 import os
 import subprocess
 import tempfile
@@ -28,6 +30,7 @@
 from autopilot.matchers import Eventually
 from autopilot.testcase import AutopilotTestCase
 from autopilot.introspection.dbus import CustomEmulatorBase
+from autopilot.introspection import _connection_matches_pid
 
 
 class EmulatorBase(CustomEmulatorBase):
@@ -122,3 +125,15 @@
         self.assertThat(result1.wasSuccessful(), Equals(True))
         result2 = InnerTestCase('test_custom_emulator').run()
         self.assertThat(result2.wasSuccessful(), Equals(True))
+
+
+class IntrospectionFunctionTests(AutopilotTestCase):
+
+    @patch('autopilot.introspection._connection_matches_pid')
+    @patch('autopilot.introspection._bus_pid_is_our_pid')
+    def test_connection_matches_pid_ignores_dbus_daemon(
+            self, bus_pid_is_our_pid, conn_matches_pid_fn):
+        _connection_matches_pid(SessionBus(), 'org.freedesktop.DBus', 123)
+
+        self.assertThat(bus_pid_is_our_pid.called, Equals(False))
+        self.assertThat(conn_matches_pid_fn.called, Equals(False))