зеркало из https://github.com/mozilla/gecko-dev.git
Back out cc46990bc189 (bug 1144898) for testSettingsMenuItems failures and crashes
This commit is contained in:
Родитель
3cb7402d5e
Коммит
5dbf07ac86
|
@ -99,6 +99,8 @@ skip-if = android_version == "10" || android_version == "18"
|
|||
# disabled on Android 2.3, bug 979600; on 4.3, bug 1145879
|
||||
skip-if = android_version == "10" || android_version == "18"
|
||||
[testSettingsMenuItems.java]
|
||||
# disabled on Android 2.3, bug 979552; on 4.3, bug 1144898
|
||||
skip-if = android_version == "10" || android_version == "18"
|
||||
# [testShareLink.java] # see bug 915897
|
||||
[testSystemPages.java]
|
||||
# disabled on 2.3, bug 979603; on 4.3, bug 1142811
|
||||
|
|
|
@ -144,7 +144,7 @@ public class testSettingsMenuItems extends PixelTest {
|
|||
"The Settings menu did not load", mStringHelper.SETTINGS_LABEL);
|
||||
|
||||
// Dismiss the Settings screen and verify that the view is returned to about:home page
|
||||
mSolo.goBack();
|
||||
mActions.sendSpecialKey(Actions.SpecialKey.BACK);
|
||||
|
||||
// Waiting for page title to appear to be sure that is fully loaded before opening the menu
|
||||
mAsserter.ok(mSolo.waitForText(mStringHelper.TITLE_PLACE_HOLDER), "about:home did not load",
|
||||
|
@ -281,7 +281,7 @@ public class testSettingsMenuItems extends PixelTest {
|
|||
mSolo.clickOnText("^Cancel$");
|
||||
} else {
|
||||
// Some submenus aren't dialogs, but are nested screens; exit using "back".
|
||||
mSolo.goBack();
|
||||
mActions.sendSpecialKey(Actions.SpecialKey.BACK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -290,8 +290,10 @@ public class testSettingsMenuItems extends PixelTest {
|
|||
if (mDevice.type.equals("phone")) {
|
||||
int menuDepth = menuPath.length;
|
||||
while (menuDepth > 0) {
|
||||
mActions.sendSpecialKey(Actions.SpecialKey.BACK);
|
||||
menuDepth--;
|
||||
mSolo.goBack();
|
||||
// Sleep so subsequent back actions aren't lost.
|
||||
mSolo.sleep(150);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче