Merge lp:~mterry/ubuntu-system-settings/wizard-introspection-rtm into lp:ubuntu-system-settings/rtm-14.09

[Michael Terry]

Allow autopilot introspection of the wizard.

Allow autopilot introspection of the wizard.

To test this, you can restart the wizard with introspection:

stop ubuntu-system-settings-wizard WIZARD_DONT_RESUME_UNITY=1
start ubuntu-system-settings-wizard QT_LOAD_TESTABILITY=1

And run a simple script like so to verify introspection works:

$ cat test.py
from autopilot.introspection import get_proxy_object_for_existing_process
import sys
print get_proxy_object_for_existing_process(pid=int(sys.argv[1]))
$ python test.py `pidof system-settings-wizard`

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 Yes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 Yes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 Yes

 * Has a 5 minute exploratory testing run been executed on N4?
 Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 NA

 * What components might get impacted by your changes?
 Just wizard

 * Have you requested review by the teams of these owning components?
 Yes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:942
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/11/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Great!

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

942. By Michael Terry on 2014-12-05

Allow testability for the wizard

=== modified file 'wizard/main.cpp'
--- wizard/main.cpp	2014-09-22 15:21:10 +0000
+++ wizard/main.cpp	2014-12-05 18:42:16 +0000
@@ -48,6 +48,23 @@
     QGuiApplication::setApplicationName("System Settings Wizard");
     QGuiApplication *application = new QGuiApplication(argc, (char**)argv);
 
+    // The testability driver is only loaded by QApplication but not by QGuiApplication.
+    // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
+    if (getenv("QT_LOAD_TESTABILITY")) {
+        QLibrary testLib(QLatin1String("qttestability"));
+        if (testLib.load()) {
+            typedef void (*TasInitialize)(void);
+            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+            if (initFunction) {
+                initFunction();
+            } else {
+                qCritical("Library qttestability resolve failed!");
+            }
+        } else {
+            qCritical("Library qttestability load failed!");
+        }
+    }
+
     bindtextdomain(I18N_DOMAIN, NULL);
     textdomain(I18N_DOMAIN);
 

=== modified file 'wizard/ubuntu-system-settings-wizard.conf'
--- wizard/ubuntu-system-settings-wizard.conf	2014-09-20 00:38:49 +0000
+++ wizard/ubuntu-system-settings-wizard.conf	2014-12-05 18:42:16 +0000
@@ -16,7 +16,9 @@
     else
         # Stop unity8, we'll start it again in post-stop (this avoids a race
         # between post-stop and unity8 unpausing)
-        stop --no-wait $JOB
+        if [ -n "$JOB" ]; then
+            stop --no-wait $JOB
+        fi
 
         # Tell unity-mir to raise SIGSTOP after we start
         initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
@@ -71,5 +73,7 @@
     stop maliit-server || true
 
     # And finally, resume unity8
-    start --no-wait $JOB || true
+    if [ -z "$WIZARD_DONT_RESUME_UNITY" ]; then
+        start --no-wait unity8 || true
+    fi
 end script