Merge lp:~3v1n0/autopilot/badwindow-errors-protect-legacy into lp:autopilot/legacy

[Marco Trevisan (Treviño)]

Bamf: protect from BadWindow errors when getting the title

A bamf window might be still on bus, but actually closed at X level,
so we must protect from errors when trying to fetch properties.

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[lp:~3v1n0/autopilot/badwindow-errors-protect-legacy]

499. By Marco Trevisan (Treviño) on 2015-09-10

tests: fix failing unit tests

500. By Martin Pitt on 2015-09-10

Fix autopilot3-sandbox-run exit status.

If autopilot fails with a non-zero exit code, capture this in $RC, instead of
capturing the exit status of "echo" (which will always succeed).

501. By Marco Trevisan (Treviño) on 2015-09-10

debian: remove downstream patches, as they're merged now

502. By Marco Trevisan (Treviño) on 2015-09-11

Bamf: avoid to crash on __repr__ because of unreachable view

503. By Marco Trevisan (Treviño) on 2015-09-11

Bamf: set proper __eq__ and __neq__ operators

=== modified file 'autopilot/process/_bamf.py'
--- autopilot/process/_bamf.py	2014-04-07 23:25:11 +0000
+++ autopilot/process/_bamf.py	2015-09-11 01:29:21 +0000
@@ -28,7 +28,7 @@
 from gi.repository import GLib
 import logging
 import os
-from Xlib import display, X, protocol
+from Xlib import display, X, protocol, error as Xerror
 from subprocess import check_output, CalledProcessError, call
 
 from autopilot.dbus_handler import get_session_bus
@@ -426,13 +426,20 @@
         return [Window(w) for w in self._view_iface.Children()]
 
     def __repr__(self):
-        return "<Application '%s'>" % (self.name)
+        try:
+            name = self.name
+        except:
+            name = self.bamf_app_path
+        return "<Application '%s'>" % (name)
 
     def __eq__(self, other):
-        if other is None:
+        if not isinstance(other, self.__class__):
             return False
         return self.desktop_file == other.desktop_file
 
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
 
 class Window(WindowBase):
     """Represents an application window, as returned by Bamf.
@@ -484,7 +491,10 @@
         .. note:: This may change depending on the current locale.
 
         """
-        return self._getProperty('_NET_WM_NAME')
+        try:
+            return self._getProperty('_NET_WM_NAME')
+        except Xerror.BadWindow:
+            return self.name
 
     @property
     def geometry(self):
@@ -592,8 +602,22 @@
         self._x_win.configure(stack_mode=X.Above)
 
     def __repr__(self):
-        return "<Window '%s' Xid: %d>" % (
-            self.title if self._x_win else '', self.x_id)
+        try:
+            title = self.title
+        except:
+            title = self._bamf_win_path
+
+        return "<Window '%s' Xid: %d>" % (title, self.x_id)
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return False
+        if self.x_id and other.x_id:
+            return self.x_id == other.x_id
+        return self._bamf_win_path == other._bamf_win_path
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
     def _getProperty(self, _type):
         """Get an X11 property.

=== modified file 'autopilot/tests/unit/test_platform.py'
--- autopilot/tests/unit/test_platform.py	2014-01-27 22:23:58 +0000
+++ autopilot/tests/unit/test_platform.py	2015-09-11 01:29:21 +0000
@@ -39,7 +39,7 @@
     @patch('autopilot.platform._PlatformDetector')
     def test_model_creates_platform_detector(self, mock_detector):
         platform.model()
-        mock_detector.create.assert_called_once()
+        mock_detector.create.assert_called_once_with()
 
     @patch('autopilot.platform._PlatformDetector._cached_detector')
     def test_model_returns_correct_value(self, mock_detector):
@@ -49,7 +49,7 @@
     @patch('autopilot.platform._PlatformDetector')
     def test_image_codename_creates_platform_detector(self, mock_detector):
         platform.image_codename()
-        mock_detector.create.assert_called_once()
+        mock_detector.create.assert_called_once_with()
 
     @patch('autopilot.platform._PlatformDetector._cached_detector')
     def test_image_codename_returns_correct_value(self, mock_detector):

=== modified file 'autopilot/tests/unit/test_testresults.py'
--- autopilot/tests/unit/test_testresults.py	2014-02-26 02:18:50 +0000
+++ autopilot/tests/unit/test_testresults.py	2015-09-11 01:29:21 +0000
@@ -34,7 +34,7 @@
 class LoggedTestResultDecoratorTests(TestCase):
 
     def construct_simple_content_object(self):
-        return text_content(self.getUniqueString)
+        return text_content(self.getUniqueString())
 
     def test_can_construct(self):
         testresult.LoggedTestResultDecorator(Mock())

=== modified file 'bin/autopilot-sandbox-run'
--- bin/autopilot-sandbox-run	2013-09-13 14:00:56 +0000
+++ bin/autopilot-sandbox-run	2015-09-11 01:29:21 +0000
@@ -173,6 +173,5 @@
 export XAUTHORITY=/dev/null
 wait_for_x $SERVERNUM
 echo "I: Starting autopilot"
-dbus-launch --exit-with-session autopilot run $AP_OPT $TESTLIST
+dbus-launch --exit-with-session autopilot run $AP_OPT $TESTLIST || RC=$?
 echo "I: autopilot tests done"
-RC=$?

=== removed directory 'debian/patches'
=== removed file 'debian/patches/sandbox_run_exit.patch'
--- debian/patches/sandbox_run_exit.patch	2014-08-06 05:48:00 +0000
+++ debian/patches/sandbox_run_exit.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-Description: Fix autopilot3-sandbox-run exit status.
- If autopilot fails with a non-zero exit code, capture this in $RC, instead of
- capturing the exit status of "echo" (which will always succeed).
-Origin: Backport of https://code.launchpad.net/~pitti/autopilot/sandbox-run/+merge/219638.
-Author: Martin Pitt <[e-mail]>
-
-Index: autopilot-legacy-1.4.1+14.10.20140430/bin/autopilot-sandbox-run
-===================================================================
---- autopilot-legacy-1.4.1+14.10.20140430.orig/bin/autopilot-sandbox-run
-+++ autopilot-legacy-1.4.1+14.10.20140430/bin/autopilot-sandbox-run
-@@ -173,6 +173,5 @@ export DISPLAY=:${SERVERNUM}.0
- export XAUTHORITY=/dev/null
- wait_for_x $SERVERNUM
- echo "I: Starting autopilot"
--dbus-launch --exit-with-session autopilot run $AP_OPT $TESTLIST
-+dbus-launch --exit-with-session autopilot run $AP_OPT $TESTLIST || RC=$?
- echo "I: autopilot tests done"
--RC=$?

=== removed file 'debian/patches/series'
--- debian/patches/series	2014-08-06 05:48:00 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-sandbox_run_exit.patch