Merge lp:~thomir-deactivatedaccount/autopilot/fix-warnings into lp:autopilot

[Thomi Richards]

Remove a spurious log message.

Remove a spurious log message.

[Martin Pitt (pitti)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/autopilot-ci/240/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-i386-ci/12/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/fix-warnings]

332. By Thomi Richards on 2013-09-20

Move test to be a functional test, since it needs dbus.

[Martin Pitt (pitti)]

Same story as for the 1.3 branch, LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/autopilot-ci/242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-i386-ci/14

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

review: Approve (continuous-integration)

=== modified file 'autopilot/introspection/__init__.py'
--- autopilot/introspection/__init__.py	2013-09-18 17:17:08 +0000
+++ autopilot/introspection/__init__.py	2013-09-20 14:32:14 +0000
@@ -404,7 +404,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-09-08 17:25:37 +0000
+++ autopilot/tests/functional/test_introspection_features.py	2013-09-20 14:32:14 +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):
@@ -123,3 +126,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))