From 6779780fbd142b9498d85cedd06cea912194bbd4 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Thu, 17 Mar 2016 10:00:49 -0600 Subject: [PATCH] Bug 1251013 - Update android_version annotations in test manifests - robocop; r=jmaher --- .../android/tests/browser/robocop/robocop.ini | 58 ++++++++----------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/mobile/android/tests/browser/robocop/robocop.ini b/mobile/android/tests/browser/robocop/robocop.ini index 8d4932458fa5..76a94cc056f3 100644 --- a/mobile/android/tests/browser/robocop/robocop.ini +++ b/mobile/android/tests/browser/robocop/robocop.ini @@ -3,14 +3,12 @@ subsuite = robocop [src/org/mozilla/gecko/tests/testGeckoProfile.java] [src/org/mozilla/gecko/tests/testAboutPage.java] -# disabled on Android 2.3; bug 975187 -skip-if = android_version == "10" [src/org/mozilla/gecko/tests/testAddonManager.java] -# disabled on 2.3: bug 941624, bug 1063509, bug 1073374, bug 1087221, bug 1088023, bug 1088027, bug 1090206; on 4.3, bug 1144918 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 1144918 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testAddSearchEngine.java] -# disabled on Android 2.3, bug 979552; on 4.3, bug 1120759 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 1120759 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testAdobeFlash.java] # disabled on 4.3, bug 1146420 skip-if = android_version == "18" @@ -19,11 +17,11 @@ skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testAxisLocking.java] # [src/org/mozilla/gecko/tests/testBookmark.java] # see bug 915350 [src/org/mozilla/gecko/tests/testBookmarksPanel.java] -# disabled on 2.3, bug 979615; on 4.3, bug 987930 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 987930 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testBookmarkFolders.java] -# disabled on Android 2.3, bug 979552; on 4.3, bug 1144921 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 1144921 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testBookmarklets.java] # [src/org/mozilla/gecko/tests/testBookmarkKeyword.java] # see bug 915350 [src/org/mozilla/gecko/tests/testBrowserProvider.java] @@ -31,8 +29,8 @@ skip-if = android_version == "10" || android_version == "18" [src/org/mozilla/gecko/tests/testDBUtils.java] [src/org/mozilla/gecko/tests/testDistribution.java] [src/org/mozilla/gecko/tests/testDoorHanger.java] -# disabled on 2.3, bug 1085609; on 4.3, bug 1144924 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 1144924 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testFilterOpenTab.java] # [src/org/mozilla/gecko/tests/testFindInPage.java] # bug 1128287 [src/org/mozilla/gecko/tests/testFlingCorrectness.java] @@ -43,8 +41,6 @@ skip-if = true # [src/org/mozilla/gecko/tests/testHistory.java] # see bug 915350 [src/org/mozilla/gecko/tests/testHomeBanner.java] [src/org/mozilla/gecko/tests/testInputUrlBar.java] -# disabled on 2.3 bug 1165511 -skip-if = android_version == "10" [src/org/mozilla/gecko/tests/testJarReader.java] [src/org/mozilla/gecko/tests/testLinkContextMenu.java] # [src/org/mozilla/gecko/tests/testHomeListsProvider.java] # see bug 952310 @@ -59,19 +55,19 @@ skip-if = android_version == "10" [src/org/mozilla/gecko/tests/testPrefsObserver.java] [src/org/mozilla/gecko/tests/testPrivateBrowsing.java] [src/org/mozilla/gecko/tests/testPromptGridInput.java] -# bug 1001657 for 2.3 and 4.3 -skip-if = android_version == "10" || android_version == "18" +# bug 1001657 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testReadingListProvider.java] [src/org/mozilla/gecko/tests/testSearchHistoryProvider.java] [src/org/mozilla/gecko/tests/testSearchSuggestions.java] -# disabled on 2.3, bug 907768; on 4.3, bug 1145867 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 1145867 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testSessionOOMSave.java] -# disabled on 2.3, bug 945395; on 4.3, bug 1144888 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 1144888 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testSessionOOMRestore.java] -# disabled on Android 2.3, bug 979600; on 4.3, bug 1145879 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3, bug 1145879 +skip-if = android_version == "18" # [src/org/mozilla/gecko/tests/testShareLink.java] # see bug 915897 # [src/org/mozilla/gecko/tests/testThumbnails.java] # see bug 813107 # [src/org/mozilla/gecko/tests/testVkbOverlap.java] # see bug 907274 @@ -85,8 +81,8 @@ skip-if = android_version == "10" || android_version == "18" # [src/org/mozilla/gecko/tests/testMozPay.java] # see bug 945675 [src/org/mozilla/gecko/tests/testOrderedBroadcast.java] [src/org/mozilla/gecko/tests/testOSLocale.java] -# disabled on 2.3 and 4.3: Bug 1124494 -skip-if = android_version == "10" || android_version == "18" +# disabled on 4.3: Bug 1124494 +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testReadingListCache.java] [src/org/mozilla/gecko/tests/testRestrictions.java] [src/org/mozilla/gecko/tests/testSnackbarAPI.java] @@ -94,26 +90,18 @@ skip-if = android_version == "10" || android_version == "18" [src/org/mozilla/gecko/tests/testUITelemetry.java] [src/org/mozilla/gecko/tests/testBug1217581.java] [src/org/mozilla/gecko/tests/testVideoControls.java] -# disabled on Android 2.3 due to video playback issues, bug 1088038; on 4.3, bug 1098532 -skip-if = android_version == "10" || android_version == "18" - -# Used for Talos, please don't use in mochitest -#[src/org/mozilla/gecko/tests/testCheck2.java] -#[src/org/mozilla/gecko/tests/testCheck3.java] # and the autophone version +# disabled on 4.3, bug 1098532 +skip-if = android_version == "18" # Using UITest #[src/org/mozilla/gecko/tests/testAboutHomePageNavigation.java] # see bug 947550, bug 979038 and bug 977952 [src/org/mozilla/gecko/tests/testAboutHomeVisibility.java] -# disabled on Android 2.3; bug 946656 -skip-if = android_version == "10" [src/org/mozilla/gecko/tests/testAppMenuPathways.java] [src/org/mozilla/gecko/tests/testBackButtonInEditMode.java] [src/org/mozilla/gecko/tests/testBrowserDatabaseHelperUpgrades.java] [src/org/mozilla/gecko/tests/testEventDispatcher.java] [src/org/mozilla/gecko/tests/testGeckoRequest.java] [src/org/mozilla/gecko/tests/testInputConnection.java] -# disabled on Android 2.3; bug 1025968 -skip-if = android_version == "10" [src/org/mozilla/gecko/tests/testJavascriptBridge.java] [src/org/mozilla/gecko/tests/testNativeCrypto.java] [src/org/mozilla/gecko/tests/testReaderModeTitle.java] @@ -124,6 +112,6 @@ skip-if = android_version == "10" # testStumblerSetting disabled on Android 4.3, bug 1145846 [src/org/mozilla/gecko/tests/testStumblerSetting.java] -skip-if = android_version == "10" || android_version == "18" +skip-if = android_version == "18" [src/org/mozilla/gecko/tests/testLoginsProvider.java]