Merge lp:~canonical-platform-qa/autopilot-qt/wily_fix-unittests into lp:autopilot-qt

[Christopher Lee]

Update unittest to reflect 2 new objects that appear in the object tree.

Update test to reflect 2 new objects that appear in the object tree.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-wily-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-wily-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-wily-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-qt-ci/31/rebuild

review: Needs Fixing (continuous-integration)

[Max Brustkern (nuclearbob)]

This seems reasonable to me. I'm still working on running tests.

review: Approve

[Max Brustkern (nuclearbob)]

With the silo 19 PPA installed, I see test failures on unity8 I didn't see on trunk. We can investigate further.

[Marco Trevisan (Treviño) (3v1n0)]

> With the silo 19 PPA installed, I see test failures on unity8 I didn't see on
> trunk. We can investigate further.

Max: it's weird. Since those branches (excluding unity7) contain only rebuilds and your and Laney's changes which shouldn't cause u8 failures.

[Max Brustkern (nuclearbob)]

Okay, I've done a lot of retesting, and I haven't been able to reproduce any unity8 test failures with the silo ppa now. I'm checking the ubuntuuitoolkit and webbrowser_app tests, but things are probably okay at this point.

[Brendan Donegan (brendan-donegan)]

Ok it seems the build errors are due to the old version of xpathselect in the archive, the version in -proposed works. There are some lintian errors on the build but those are pre-existing

review: Approve

[Max Brustkern (nuclearbob)]

FWIW, I've also completed the browser testing and found no errors, and the uuit testing looks good so far.

=== modified file 'tests/unittests/tst_introspection.cpp'
--- tests/unittests/tst_introspection.cpp	2014-07-21 02:04:52 +0000
+++ tests/unittests/tst_introspection.cpp	2015-08-25 00:31:39 +0000
@@ -107,11 +107,13 @@
                     QStringList()
                         << "QMainWindow"
                         << "QWidgetWindow"
+                        << "QWidgetWindow"
+                        << "QWidgetWindow"
                     )
             );
 
-    QTest::newRow("//QWidget[id=6]")
-        << "//QWidget[id=6]"
+    QTest::newRow("//QWidget[id=8]")
+        << "//QWidget[id=8]"
         << 1
         << "/tst_introspection/QMainWindow/QWidget"
         << "objectName"
@@ -121,8 +123,8 @@
                 << "centralTestWidget"
             );
 
-    QTest::newRow("//QPushButton[id=9]")
-        << "//QPushButton[id=9]"
+    QTest::newRow("//QPushButton[id=11]")
+        << "//QPushButton[id=11]"
         << 1
         << "/tst_introspection/QMainWindow/QWidget/QPushButton"
         << "objectName"