v121.0

dothq · Dec 26, 2023 · 29768b4 · 29768b4
2 parents e55b5e8 + c53c869
commit 29768b4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/python/mozboot/mozboot/android-avds/arm.json b/python/mozboot/mozboot/android-avds/arm.json
@@ -22,5 +22,6 @@
         "hw.lcd.density": "320",
         "disk.dataPartition.size": "4000MB",
         "sdcard.size": "600M"
-    }
+    },
+    "emulator_prewarm": false
 }
diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/test_searchconfig_validates.js b/toolkit/components/search/tests/xpcshell/searchconfigs/test_searchconfig_validates.js
@@ -127,20 +127,25 @@ add_task(async function test_ui_schema_valid_v1() {
   await checkUISchemaValid(searchConfigSchemaV1, uiSchema);
 });
 
-add_task(async function test_search_config_validates_to_schema() {
-  delete SearchUtils.newSearchConfigEnabled;
-  SearchUtils.newSearchConfigEnabled = true;
-
-  let selector = new SearchEngineSelector(() => {});
-  let searchConfig = await selector.getEngineConfiguration();
-
-  await checkSearchConfigValidates(searchConfigSchema, searchConfig);
-});
-
-add_task(async function test_ui_schema_valid() {
-  let uiSchema = await IOUtils.readJSON(
-    PathUtils.join(do_get_cwd().path, "search-engine-config-v2-ui-schema.json")
-  );
+if (SearchUtils.newSearchConfigEnabled) {
+  add_task(async function test_search_config_validates_to_schema() {
+    delete SearchUtils.newSearchConfigEnabled;
+    SearchUtils.newSearchConfigEnabled = true;
+
+    let selector = new SearchEngineSelector(() => {});
+    let searchConfig = await selector.getEngineConfiguration();
+
+    await checkSearchConfigValidates(searchConfigSchema, searchConfig);
+  });
+
+  add_task(async function test_ui_schema_valid() {
+    let uiSchema = await IOUtils.readJSON(
+      PathUtils.join(
+        do_get_cwd().path,
+        "search-engine-config-v2-ui-schema.json"
+      )
+    );
 
-  await checkUISchemaValid(searchConfigSchema, uiSchema);
-});
+    await checkUISchemaValid(searchConfigSchema, uiSchema);
+  });
+}