35caf88 · unity8 · git.iko.soy

git.iko.soy/unity8

reenable or drop disabled tests

Approved by: Albert Astals Cid

commit35caf886b426ef7a84f70bb0532eedea3bb3ce3d authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 27 May 2016, 13:52 (10 years ago) parentb6c8657 0e32fda

4 files changed+1−82

compare with xenial

unifiedsplit

qml/Dash/ScopesList.qml+1−13 tests/plugins/Unity/Session/sessionbackendtest.cpp−15 tests/qmltests/Dash/Previews/tst_Preview.qml−1 tests/qmltests/Dash/tst_Dash.qml−53

qml/Dash/ScopesList.qml+1−13

@@ -49,18 +49,6 @@ Item {

4949 anchors.fill: parent

5050 }

5151

52− Binding {

53− target: root.scope

54− property: "searchQuery"

55− value: header.searchQuery

56− }

57−

58− Binding {

59− target: header

60− property: "searchQuery"

61− value: root.scope ? root.scope.searchQuery : ""

62− }

63−

6452 DashPageHeader {

6553 id: header

6654 objectName: "pageHeader"

@@ -70,7 +58,7 @@ Item {

7058 showBackButton: true

7159 backIsClose: root.state == "edit"

7260 storeEntryEnabled: root.state == "browse"

73− searchEntryEnabled: false // Disable search for now

61+ searchEntryEnabled: false

7462 scopeStyle: root.scopeStyle

7563 onBackClicked: {

7664 if (backIsClose) {

tests/plugins/Unity/Session/sessionbackendtest.cpp−15

@@ -148,21 +148,6 @@ private Q_SLOTS:

148148 }

149149 }

150150

151− void testLogin1Capabilities() {

152− QSKIP("This test talks to real logind backend, it will fail depending on how the machine is set up");

153− DBusUnitySessionService dbusUnitySessionService;

154− QDBusInterface login1face("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus());

155− QCoreApplication::processEvents(); // to let the services register on DBus

156−

157− if (login1face.isValid()) {

158− QCOMPARE(dbusUnitySessionService.CanHibernate(), (login1face.call("CanHibernate").arguments().first().toString() != "no"));

159− QCOMPARE(dbusUnitySessionService.CanSuspend(), (login1face.call("CanSuspend").arguments().first().toString() != "no"));

160− QCOMPARE(dbusUnitySessionService.CanReboot(), (login1face.call("CanReboot").arguments().first().toString() != "no"));

161− QCOMPARE(dbusUnitySessionService.CanShutdown(), (login1face.call("CanPowerOff").arguments().first().toString() != "no"));

162− QCOMPARE(dbusUnitySessionService.CanHybridSleep(), (login1face.call("CanHybridSleep").arguments().first().toString() != "no"));

163− }

164− }

165−

166151private:

167152 QDBusInterface *dbusUnitySession;

168153};

tests/qmltests/Dash/Previews/tst_Preview.qml−1

@@ -109,7 +109,6 @@ Rectangle {

109109 }

110110

111111 function test_comboEnsureVisible() {

112− skip("Flaky in adt but can't reproduce locally. Given the deadline I won't risk this getting stuck in proposed.");

113112 waitForRendering(preview);

114113

115114 // Scroll down

tests/qmltests/Dash/tst_Dash.qml−53

@@ -279,59 +279,6 @@ Item {

279279 compare(dashContentList.currentIndex, 0);

280280 }

281281

282− function test_manage_dash_search_temp_scope() {

283− // TODO Search is disabled for now in manage dash

284− skip();

285−

286− // Show the manage dash

287− touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));

288− var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");

289− tryCompare(bottomEdgeController, "progress", 1);

290−

291− // Do a search

292− var scopesList = findChild(dash, "scopesList");

293− var scopesListPageHeader = findChild(scopesList, "pageHeader");

294− var searchButton = findChild(scopesListPageHeader, "search_header_button");

295− mouseClick(searchButton);

296−

297− // Type something

298− keyClick(Qt.Key_H);

299−

300− // Click on a temp scope in the search

301− tryCompareFunction( function() { return findChild(scopesList, "scopesListCategorysearchA") != null; }, true);

302− var dashCategorysearchA = findChild(scopesList, "scopesListCategorysearchA");

303− tryCompareFunction( function() { return findChild(dashCategorysearchA, "delegate2") != null; }, true);

304− var cardTempScope = findChild(dashCategorysearchA, "delegate2");

305−

306− waitForRendering(cardTempScope);

307− mouseClick(cardTempScope);

308−

309− // Check the bottom edge (overview) is disabled from temp scope

310− var overviewDragHandle = findChild(dash, "overviewDragHandle");

311− compare(overviewDragHandle.enabled, false);

312−

313− // Check temp scope is there

314− var dashTempScopeItem = findChild(dash, "dashTempScopeItem");

315− tryCompare(dashTempScopeItem, "x", 0);

316− tryCompare(dashTempScopeItem, "visible", true);

317−

318− // Check the manage dash is gone

319− tryCompare(bottomEdgeController, "progress", 0);

320−

321− // Go back

322− var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");

323− var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");

324− mouseClick(backButton);

325−

326− // Check temp scope is gone

327− tryCompare(dashTempScopeItem, "x", dash.width);

328− tryCompare(dashTempScopeItem, "visible", false);

329−

330− // Original list is still on 0

331− var dashContentList = findChild(dash, "dashContentList");

332− compare(dashContentList.currentIndex, 0);

333− }

334−

335282 function test_manage_dash_open_no_favorites() {

336283 // Make it so there are no scopes

337284 scopes.clear();