Backed out 2 changesets (bug 1821243) for causing xpcshell failures o…

…n test_RemoteSettingsExperimentLoader_updateRecipes.js CLOSED TREE Backed out changeset 39df97ca8253 (bug 1821243) Backed out changeset bbb8006a0784 (bug 1821243)
iaxat · Mar 16, 2023 · c3e1f73 · c3e1f73
1 parent b829d18
commit c3e1f73
Show file tree

Hide file tree

Showing 71 changed files with 1,835 additions and 7,751 deletions.
diff --git a/...ponents/newtab/content-src/asrouter/schemas/BackgroundTaskMessagingExperiment.schema.json b/...ponents/newtab/content-src/asrouter/schemas/BackgroundTaskMessagingExperiment.schema.json
@@ -216,6 +216,10 @@
       },
       "additionalProperties": true,
       "dependentRequired": {
+        "id": [
+          "content",
+          "template"
+        ],
         "content": [
           "id",
           "template"

diff --git a/browser/components/newtab/content-src/asrouter/schemas/FxMSCommon.schema.json b/browser/components/newtab/content-src/asrouter/schemas/FxMSCommon.schema.json
@@ -103,6 +103,7 @@
       },
       "additionalProperties": true,
       "dependentRequired": {
+        "id": ["content", "template"],
         "content": ["id", "template"],
         "template": ["id", "content"]
       }

diff --git a/browser/components/newtab/content-src/asrouter/schemas/MessagingExperiment.schema.json b/browser/components/newtab/content-src/asrouter/schemas/MessagingExperiment.schema.json
@@ -1370,6 +1370,10 @@
       },
       "additionalProperties": true,
       "dependentRequired": {
+        "id": [
+          "content",
+          "template"
+        ],
         "content": [
           "id",
           "template"

diff --git a/browser/components/newtab/test/xpcshell/test_reach_experiments.js b/browser/components/newtab/test/xpcshell/test_reach_experiments.js
@@ -55,9 +55,7 @@ function assertContains(haystack, needle) {
 }
 
 add_task(function test_reach_experiment_dependentRequired() {
-  info(
-    "Testing that if id is present then content and template are not required"
-  );
+  info("Testing that if id is present then content and template are required");
 
   {
     const message = {
@@ -66,10 +64,12 @@ add_task(function test_reach_experiment_dependentRequired() {
     };
 
     const result = EXPERIMENT_VALIDATOR.validate(message);
-    Assert.ok(result.valid, "message should validate");
+    Assert.ok(!result.valid, "message should not validate");
+
+    assertContains(result.errors, depError("id", "content"));
+    assertContains(result.errors, depError("id", "template"));
   }
 
-  info("Testing that if content is present then id and template are required");
   {
     const message = {
       ...MESSAGES[0],
@@ -82,7 +82,6 @@ add_task(function test_reach_experiment_dependentRequired() {
     assertContains(result.errors, depError("content", "template"));
   }
 
-  info("Testing that if template is present then id and content are required");
   {
     const message = {
       ...MESSAGES[0],

diff --git a/python/sites/docs.txt b/python/sites/docs.txt
@@ -11,7 +11,9 @@ pypi:fluent.pygments==1.0
 pypi:fluent.syntax==0.18.1
 pypi:idna==2.10
 pypi:imagesize==1.2.0
+pypi:importlib-resources==3.0.0
 pypi:jmespath==0.10.0
+pypi:jsonschema==3.2.0
 pypi:livereload==2.6.3
 pypi:Markdown==3.3.4
 pypi:MarkupSafe==2.0.1
@@ -49,14 +51,11 @@ pypi:sphinxcontrib-mermaid==0.8.1
 pypi:sphinxcontrib-qthelp==1.0.3
 pypi:sphinxcontrib-serializinghtml==1.1.5
 pypi:tornado==6.0.4
-vendored:third_party/python/Jinja2
 vendored:third_party/python/certifi
 vendored:third_party/python/chardet
 vendored:third_party/python/importlib_metadata
-vendored:third_party/python/importlib_resources
-vendored:third_party/python/jsonschema
+vendored:third_party/python/Jinja2
 vendored:third_party/python/packaging
-vendored:third_party/python/pkgutil_resolve_name
 vendored:third_party/python/requests
 vendored:third_party/python/rsa
 vendored:third_party/python/sentry_sdk

diff --git a/python/sites/mach.txt b/python/sites/mach.txt
@@ -80,7 +80,6 @@ vendored:third_party/python/giturlparse
 vendored:third_party/python/gyp/pylib
 vendored:third_party/python/idna
 vendored:third_party/python/importlib_metadata
-vendored:third_party/python/importlib_resources
 vendored:third_party/python/Jinja2
 vendored:third_party/python/jinxed
 vendored:third_party/python/jsmin
@@ -96,7 +95,6 @@ vendored:third_party/python/packaging
 vendored:third_party/python/pathspec
 vendored:third_party/python/pip
 vendored:third_party/python/pip_tools
-vendored:third_party/python/pkgutil_resolve_name
 vendored:third_party/python/ply
 vendored:third_party/python/pyasn1
 vendored:third_party/python/pyasn1_modules

diff --git a/third_party/python/importlib_resources/importlib_resources-5.12.0.dist-info/LICENSE b/third_party/python/importlib_resources/importlib_resources-5.12.0.dist-info/LICENSE