From 56b7fc787523430c48a132b44ffb582efca79a05 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 2 Nov 2026 10:02:33 +0100 Subject: [PATCH 1/2] test: fix `test-config-json-schema` with `--openssl-use-def-ca-store` Signed-off-by: Antoine du Hamel --- test/parallel/test-config-json-schema.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/parallel/test-config-json-schema.js b/test/parallel/test-config-json-schema.js index 05efa69e2b64..46a5d9f2e11e 100644 --- a/test/parallel/test-config-json-schema.js +++ b/test/parallel/test-config-json-schema.js @@ -44,7 +44,11 @@ const assert = require('assert'); // Round-trip through JSON so that the null-prototype objects returned by // generateConfigJsonSchema() show up as plain objects in the diff. -const schema = JSON.parse(JSON.stringify(generateConfigJsonSchema())); +const schema = JSON.parse( + JSON.stringify(generateConfigJsonSchema()) + // If node was built with --openssl-use-def-ca-store configure flag, + // it affects the values of `use-bundled-ca` and `use-openssl-ca`. + .replace(/ CA store \(default\)/g, ' CA store')); // This assertion ensures that whenever we add a new env option, we also add it // to the JSON schema. The function getEnvOptionsInputType() returns all the available From 78b387ee129792a0c10e842ee414b11c49b76d8f Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 2 Nov 2026 14:57:21 +0100 Subject: [PATCH 2/2] fixup! test: fix `test-config-json-schema` with `--openssl-use-def-ca-store` --- test/parallel/test-config-json-schema.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-config-json-schema.js b/test/parallel/test-config-json-schema.js index 46a5d9f2e11e..9f4bd6e239b7 100644 --- a/test/parallel/test-config-json-schema.js +++ b/test/parallel/test-config-json-schema.js @@ -44,11 +44,16 @@ const assert = require('assert'); // Round-trip through JSON so that the null-prototype objects returned by // generateConfigJsonSchema() show up as plain objects in the diff. +const schemaString = JSON.stringify(generateConfigJsonSchema()); const schema = JSON.parse( - JSON.stringify(generateConfigJsonSchema()) + schemaString.includes('"description":"use bundled CA store"') && + schemaString.includes('"description":"use OpenSSL\'s default CA store (default)"') ? // If node was built with --openssl-use-def-ca-store configure flag, // it affects the values of `use-bundled-ca` and `use-openssl-ca`. - .replace(/ CA store \(default\)/g, ' CA store')); + schemaString.replace('"use bundled CA store"', '"use bundled CA store (default)"') + .replace('"use OpenSSL\'s default CA store (default)"', '"use OpenSSL\'s default CA store"') : + schemaString +); // This assertion ensures that whenever we add a new env option, we also add it // to the JSON schema. The function getEnvOptionsInputType() returns all the available