Merge lp:~fginther/unity/autopilot-showdesktop-cleanup into lp:unity

[Francis Ginther]

Open a temporary app window to always allow exit from showdesktop_active mode.

If there are no application windows open, showdesktop_active can be set, but not cleared. This provides a hackish solution that will get unity back into the desired state for the next test. It does not solve the problem of a test attempting to leave showdesktop_active mode under these conditions.

Open a temporary app window to always allow exit from showdesktop_active mode.

If there are no application windows open, showdesktop_active can be set, but not cleared. This provides a hackish solution that will get unity back into the desired state for the next test. It does not solve the problem of a test attempting to leave showdesktop_active mode under these conditions.

Testing:
Before this change, I would see nearly 300 of the 464 tests fail with message "Test left the system in show desktop mode, exiting it...". After this change, I only saw one of these failures. Total failures went from 312 to 116. Testing was done on a virtual-box vm running unity 6.10.0bzr2895pkg0quantal0.

[Martin Mrazik (mrazik)]

Just two technical notes:
1. The linking to the bug is unfortunate. If this gets approved and merged the bug will be marked as "Fix Committed" which is not going to be the case. This branch is just a workaround for the bug and not a real fix.

2. If we don't want to get this into trunk (as it is just a workaround) maybe it can be maintained as a distro patch (which makes sense as the patch is indeed primarily for us being able to release unity continuously in ubuntu). The other option (implemented right now) is the utah-jenkins branch. Unfortunately if the patch doesn't merge cleanly we will only notice too late.

Francis, the Needs Fixing is for #1 from my POV (you can add the link to the bugreport into description). I leave the #2 for the others.

review: Needs Fixing

[Martin Mrazik (mrazik)]

and btw. if you have used something like "bzr commit --fixes" then it needs to go away as well (too lazy to check).

[Didier Roche-Tolomelli (didrocks)]

I'm answering on #2:
We don't want distro patch. It's an easy answer for putting all the hacks outside of trunk and put that in the distro. Please either fix it properly, with normal tests, or take the responsibility of the workaround and put it in trunk.

We don't want the unity stack and ubuntu to diverge more than all the distro patches we already have in compiz.

[Timo Jyrinki (timo-jyrinki)]

IMHO a reasonable workaround for now. Remove the bug link to 1079460.

review: Approve

[Francis Ginther (fginther)]

> Just two technical notes:
> 1. The linking to the bug is unfortunate. If this gets approved and merged the
> bug will be marked as "Fix Committed" which is not going to be the case. This
> branch is just a workaround for the bug and not a real fix.
>
> Francis, the Needs Fixing is for #1 from my POV (you can add the link to the
> bugreport into description). I leave the #2 for the others.

Uploaded the branch after removing the linked bug.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/138/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/138/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

review: Approve

[Francis Ginther (fginther)]

This MP is to workaround https://bugs.launchpad.net/unity/+bug/1079460

=== modified file 'tests/autopilot/unity/tests/__init__.py'
--- tests/autopilot/unity/tests/__init__.py	2012-11-16 16:54:25 +0000
+++ tests/autopilot/unity/tests/__init__.py	2012-11-19 14:22:23 +0000
@@ -19,6 +19,7 @@
 import os
 import sys
 from tempfile import mktemp
+from time import sleep
 try:
     import testapp
     import json
@@ -106,7 +107,23 @@
             well_behaved = False
             reasons.append("The test left the system in show_desktop mode.")
             log.warning("Test left the system in show desktop mode, exiting it...")
-            self.window_manager.leave_show_desktop()
+            # It is not possible to leave show desktop mode if there are no
+            # app windows. So, just open a window and perform the show
+            # desktop action until the desired state is acheived, then close
+            # the window. The showdesktop_active state will persist.
+            #
+            # In the event that this doesn't work, wait_for will throw an
+            # exception.
+            win = self.start_app_window('Calculator', locale='C')
+            count = 1
+            while self.window_manager.showdesktop_active:
+                self.keybinding("window/show_desktop")
+                sleep(count)
+                count+=1
+                if count > 10:
+                    break
+            win.close()
+            self.window_manager.showdesktop_active.wait_for(False)
         for launcher in self.launcher.get_launchers():
             if not self.well_behaved(launcher, in_keynav_mode=False):
                 well_behaved = False