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

[Thomi Richards]

Remove a spurious log message.

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

[lp:~thomir-deactivatedaccount/autopilot/1.3-fix-warning]

336. By Thomi Richards on 2013-09-20

Move test to a functional test case, so dbus is available.

337. By Thomi Richards on 2013-09-20

remove old test.

Unmerged revisions

=== modified file 'autopilot/introspection/__init__.py'
--- autopilot/introspection/__init__.py	2013-09-18 17:17:08 +0000
+++ autopilot/introspection/__init__.py	2013-09-19 19:53:38 +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/unit/test_proxy_objects.py'
--- autopilot/tests/unit/test_proxy_objects.py	2013-07-24 04:45:13 +0000
+++ autopilot/tests/unit/test_proxy_objects.py	2013-09-19 19:53:38 +0000
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from dbus import DBusException
+from dbus import DBusException, SessionBus
 from testtools import TestCase
 from testtools.matchers import Equals
 from mock import patch, Mock
@@ -204,6 +204,15 @@
             self.fake_bus, self.fake_connection_name, test_pid)
         self.assertThat(result, Equals(False))
 
+    @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))
+
     @patch('autopilot.introspection._bus_pid_is_our_pid')
     def test_match_connection_fails_bus_pid_is_our_pid(self, bus_pid_fn):
         test_pid = 0

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-17 04:24:51 +0000
+++ debian/changelog	2013-09-19 19:53:38 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 autopilot (1.4+14.04.20130917ubuntu.unity.next-0ubuntu1) saucy; urgency=low
 
   [ Thomi Richards ]
@@ -19,6 +20,44 @@
 
  -- Thomi Richards <[e-mail]>  Fri, 16 Aug 2013 08:47:12 +1200
 
+=======
+autopilot (1.3.1+13.10.20130918-0ubuntu1) saucy; urgency=low
+
+  [ Jean-Baptiste Lallement ]
+  * Added autopilot-sandbox-run to run autopilot tests in a 'fake' X
+    server. Xephyr and Xvfb are supported. (LP: #1226070)
+
+  [ Thomi Richards ]
+  * kzgdiparg ugp srgp s r ua. (LP: #1205204)
+  * Add support for click packages. (LP: #1212833)
+  * Update StateNotFoundErrror exception to give more informative
+    messages. (LP: #1225701)
+  * Fix select_single inconsistency. (LP: #1225692)
+  * Create wait_select_single method. (LP: #1223428)
+  * Add test case for applications that exit with SIGABRT when launched
+    with autopilot.
+  * Back out changes that would break test case compatibility. (LP:
+    #1226505)
+  * Performance improvments for launching and closing applications under
+    test with autopilot. (LP: #1218636)
+
+  [ Andy Doan ]
+  * Add support for click packages. (LP: #1212833)
+
+  [ Christopher Lee ]
+  * commit message. (LP: #1205949)
+
+  [ Martin Pitt ]
+  * Add bamfdaemon to autopilot-desktop dependencies, to avoid long
+    delays when running autopilot in minimal environments. (LP:
+    #1224970)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 333
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 18 Sep 2013 06:03:34 +0000
+
+>>>>>>> MERGE-SOURCE
 autopilot (1.3.1+13.10.20130906.1-0ubuntu1) saucy; urgency=low
 
   [ Christopher Lee ]