Bugfix MTE-4133 Retries in fastlane/L10n (#24285)

Recreate from another branch :-/
mozilla-mobile · Jan 22, 2025 · 7c87f32 · 7c87f32
1 parent 6a5b26c
commit 7c87f32
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 10 deletions.
diff --git a/firefox-ios/Client.xcodeproj/project.pbxproj b/firefox-ios/Client.xcodeproj/project.pbxproj
@@ -669,6 +669,7 @@
 		74F80D342A0A52D700013C3D /* PrivacyPolicyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F80D332A0A52D700013C3D /* PrivacyPolicyViewController.swift */; };
 		781C19CF2A780BEC0000DF46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 781C19CE2A780BEC0000DF46 /* Common */; };
 		787EDD852943EE75002B93AE /* JumpBackInTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 787EDD832943EE75002B93AE /* JumpBackInTests.swift */; };
+		78CD8C9E2D4150D800CA1BBF /* L10nSnapshotTests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 78CD8C9D2D4150D700CA1BBF /* L10nSnapshotTests.xctestplan */; };
 		78F28FC02CB81FDF00DA862E /* InactiveTabsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78F28FBF2CB81FDF00DA862E /* InactiveTabsTest.swift */; };
 		78FE1E892B040E7000338465 /* FirefoxSuggestTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78FE1E872B040E7000338465 /* FirefoxSuggestTest.swift */; };
 		7AC7E0502C160FF800051D4D /* ReaderPanelEmptyStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC7E04F2C160FF800051D4D /* ReaderPanelEmptyStateView.swift */; };
@@ -7361,6 +7362,7 @@
 		78784AF7A74084713651DC6D /* hsb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hsb; path = hsb.lproj/ClearPrivateDataConfirm.strings; sourceTree = "<group>"; };
 		787EDD832943EE75002B93AE /* JumpBackInTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JumpBackInTests.swift; sourceTree = "<group>"; };
 		78CD409D8D95F94C1738A444 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/HistoryPanel.strings; sourceTree = "<group>"; };
+		78CD8C9D2D4150D700CA1BBF /* L10nSnapshotTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = L10nSnapshotTests.xctestplan; sourceTree = "<group>"; };
 		78F28FBF2CB81FDF00DA862E /* InactiveTabsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InactiveTabsTest.swift; sourceTree = "<group>"; };
 		78FE1E872B040E7000338465 /* FirefoxSuggestTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirefoxSuggestTest.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		797548C8B7F6A801A090D219 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/ClearHistoryConfirm.strings; sourceTree = "<group>"; };
@@ -13687,6 +13689,7 @@
 		E15A8B2B286CFD48004BB2B8 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				78CD8C9D2D4150D700CA1BBF /* L10nSnapshotTests.xctestplan */,
 				2FA4360B1ABB83B4008031D1 /* AccountTests */,
 				F84B21D61A090F8100AAB793 /* ClientTests */,
 				EAF79C172A6F0B9500251CA4 /* ExperimentIntegrationTests.xctestplan */,
@@ -15645,6 +15648,7 @@
 				8ABE9F1E2CB462CA0080E1DF /* RemoteSettingsFetchConfig.json in Resources */,
 				1D91C1872CF11EA500B24960 /* disconnect-block-cookies-advertising.json in Resources */,
 				1D91C1842CF11EA500B24960 /* disconnect-block-cryptomining.json in Resources */,
+				78CD8C9E2D4150D800CA1BBF /* L10nSnapshotTests.xctestplan in Resources */,
 				39F4C0FA2045D87400746155 /* FocusHelper.js in Resources */,
 				E1AF3562286DE5F800960045 /* Smoketest2.xctestplan in Resources */,
 				8C29376C2BF79EE000146613 /* AddressFormManager.mjs in Resources */,

diff --git a/firefox-ios/Client.xcodeproj/xcshareddata/xcschemes/L10nSnapshotTests.xcscheme b/firefox-ios/Client.xcodeproj/xcshareddata/xcschemes/L10nSnapshotTests.xcscheme
@@ -28,6 +28,12 @@
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       shouldUseLaunchSchemeArgsEnv = "YES"
       systemAttachmentLifetime = "keepAlways">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:firefox-ios-tests/Tests/L10nSnapshotTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,6 +63,57 @@
                referenceType = "1">
             </LocationScenarioReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7BEB64401C7345600092C02E"
+               BuildableName = "L10nSnapshotTests.xctest"
+               BlueprintName = "L10nSnapshotTests"
+               ReferencedContainer = "container:Client.xcodeproj">
+            </BuildableReference>
+            <SelectedTests>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/test3ReloadButtonContextMenu()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testBookmarksTableContextMenu()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testETPperSite()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testHistoryTableContextMenu()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testIntro()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testMenuOnTopSites()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testPrivateBrowsingTabsEmptyState()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testSettings()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testSettingsETP()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testTakeMarketingScreenshots()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testTopSitesMenu()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testWebViewAuthenticationDialog()">
+               </Test>
+               <Test
+                  Identifier = "L10nSuite1SnapshotTests/testWebViewContextMenu()">
+               </Test>
+            </SelectedTests>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -85,15 +142,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7BEB64401C7345600092C02E"
-            BuildableName = "L10nSnapshotTests.xctest"
-            BlueprintName = "L10nSnapshotTests"
-            ReferencedContainer = "container:Client.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "FirefoxBetaEnterprise">

diff --git a/firefox-ios/firefox-ios-tests/Tests/L10nSnapshotTests.xctestplan b/firefox-ios/firefox-ios-tests/Tests/L10nSnapshotTests.xctestplan
@@ -0,0 +1,47 @@
+{
+  "configurations" : [
+    {
+      "id" : "7F6634E8-01BE-4D91-A69C-2535D9BA6F5C",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "selectedTests" : [
+        "L10nSuite1SnapshotTests\/test3ReloadButtonContextMenu()",
+        "L10nSuite1SnapshotTests\/testBookmarksTableContextMenu()",
+        "L10nSuite1SnapshotTests\/testETPperSite()",
+        "L10nSuite1SnapshotTests\/testHistoryTableContextMenu()",
+        "L10nSuite1SnapshotTests\/testIntro()",
+        "L10nSuite1SnapshotTests\/testMenuOnTopSites()",
+        "L10nSuite1SnapshotTests\/testPrivateBrowsingTabsEmptyState()",
+        "L10nSuite1SnapshotTests\/testSettings()",
+        "L10nSuite1SnapshotTests\/testSettingsETP()",
+        "L10nSuite1SnapshotTests\/testTakeMarketingScreenshots()",
+        "L10nSuite1SnapshotTests\/testTopSitesMenu()",
+        "L10nSuite1SnapshotTests\/testWebViewAuthenticationDialog()",
+        "L10nSuite1SnapshotTests\/testWebViewContextMenu()",
+        "L10nSuite2SnapshotTests\/testFxASignInPage()",
+        "L10nSuite2SnapshotTests\/testLoginDetails()",
+        "L10nSuite2SnapshotTests\/testLongPressOnTextOptions()",
+        "L10nSuite2SnapshotTests\/testMenuOnWebPage()",
+        "L10nSuite2SnapshotTests\/testPageMenuOnWebPage()",
+        "L10nSuite2SnapshotTests\/testPanelsEmptyState()",
+        "L10nSuite2SnapshotTests\/testURLBar()",
+        "L10nSuite2SnapshotTests\/testURLBarContextMenu()"
+      ],
+      "target" : {
+        "containerPath" : "container:Client.xcodeproj",
+        "identifier" : "7BEB64401C7345600092C02E",
+        "name" : "L10nSnapshotTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/firefox-ios/l10n-screenshots.sh b/firefox-ios/l10n-screenshots.sh
@@ -34,6 +34,7 @@ for lang in $LOCALES; do
     echo "$(date) Snapshotting $lang"
     mkdir "l10n-screenshots/$lang"
     fastlane snapshot --project firefox-ios/Client.xcodeproj --scheme L10nSnapshotTests \
+        --testPlan L10nSnapshotTests \
         --number_of_retries 0 \
         --skip_open_summary \
         --xcargs "-maximum-parallel-testing-workers 2" \
@@ -42,11 +43,12 @@ for lang in $LOCALES; do
         --erase_simulator --localize_simulator \
         --devices "iPhone 16" --languages "$lang" \
         --output_directory "l10n-screenshots/$lang" \
+        --xcodebuild_formatter xcbeautify \
         $EXTRA_FAST_LANE_ARGS | tee output.txt
     if [ "$?" != "0" ]; then
         echo "Fastlane exited with code: $?"
         exit $?
-    elif grep -q "** TEST FAILED **"; then
+    elif grep -q "TEST FAILED" "output.txt"; then
         echo "Test/compilation failed"
         exit 1
     elif grep -q "Caught error" "output.txt"; then