1862679 - The new and old SearchEngineSelectors should always load the correct configuration

Status: RESOLVED FIXED

(Firefox :: Search, task, P2)

Description

[Mark Banner (:standard8)]

The new and old SearchEngineSelectors currently load the configuration based on SearchUtils.SETTINGS_KEY, whose value is determined by a preference.

I think this breaks what you expect, especially when loading a selector for testing either the new or old configuration - they should load the configuration that they are designed for.

Hence, I think we should add a couple of extra constants and use those for the selectors. Tests should probably still use SETTINGS_KEY unless they need to use the new constants for specific parts of testing.

Comment 1

[Mark Banner (:standard8)]

Attachment: Bug 1862679 - Ensure the new and old SearchEngineSelectors should always load the correct configuration. r?#search-reviewers!

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/0e929612278f
Ensure the new and old SearchEngineSelectors should always load the correct configuration. r=search-reviewers,mcheang

Comment 3

[Natalia Csoregi [:nataliaCs]]

Backed out for causing failures on test_engine_selector_application_distribution.js

• backout: https://hg.mozilla.org/integration/autoland/rev/ac9b148114167f5756dc5c77cf8bafb6a3b05399
• push: https://treeherder.mozilla.org/jobs?repo=autoland&selectedTaskRun=Z-xDhJH_TaWDCXWWJu8WpQ.0&revision=0e929612278fd96b9bc166122236cab3498cf015
• failure log: https://treeherder.mozilla.org/logviewer?job_id=434724874&repo=autoland&lineNumber=3513

[task 2023-11-02T16:43:22.318Z] 16:43:22     INFO -  TEST-START | xpcshell.ini:toolkit/components/search/tests/xpcshell/test_engine_selector_application_distribution.js
[task 2023-11-02T16:43:26.387Z] 16:43:26  WARNING -  TEST-UNEXPECTED-FAIL | xpcshell.ini:toolkit/components/search/tests/xpcshell/test_engine_selector_application_distribution.js | xpcshell return code: 0
[task 2023-11-02T16:43:26.388Z] 16:43:26     INFO -  TEST-INFO took 4067ms
[task 2023-11-02T16:43:26.389Z] 16:43:26     INFO -  >>>>>>>
[task 2023-11-02T16:43:26.390Z] 16:43:26     INFO -  (xpcshell/head.js) | test MAIN run_test pending (1)
[task 2023-11-02T16:43:26.391Z] 16:43:26     INFO -  (xpcshell/head.js) | test run_next_test 0 pending (2)
[task 2023-11-02T16:43:26.391Z] 16:43:26     INFO -  (xpcshell/head.js) | test MAIN run_test finished (2)
[task 2023-11-02T16:43:26.392Z] 16:43:26     INFO -  running event loop
[task 2023-11-02T16:43:26.393Z] 16:43:26     INFO -  xpcshell.ini:toolkit/components/search/tests/xpcshell/test_engine_selector_application_distribution.js | Starting setup
[task 2023-11-02T16:43:26.394Z] 16:43:26     INFO -  (xpcshell/head.js) | test pending (2)
[task 2023-11-02T16:43:26.394Z] 16:43:26     INFO -  (xpcshell/head.js) | test run_next_test 0 finished (2)
[task 2023-11-02T16:43:26.395Z] 16:43:26     INFO -  (xpcshell/head.js) | test run_next_test 1 pending (2)
[task 2023-11-02T16:43:26.396Z] 16:43:26     INFO -  (xpcshell/head.js) | test finished (2)
[task 2023-11-02T16:43:26.396Z] 16:43:26     INFO -  xpcshell.ini:toolkit/components/search/tests/xpcshell/test_engine_selector_application_distribution.js | Starting test_no_distribution_preference
[task 2023-11-02T16:43:26.397Z] 16:43:26     INFO -  (xpcshell/head.js) | test test_no_distribution_preference pending (2)
[task 2023-11-02T16:43:26.398Z] 16:43:26     INFO -  (xpcshell/head.js) | test run_next_test 1 finished (2)
[task 2023-11-02T16:43:26.399Z] 16:43:26     INFO -  PID 11809 | console.debug: SearchEngineSelector: "fetchEngineConfiguration default:default:::undefined:XPCShell:42"
[task 2023-11-02T16:43:26.399Z] 16:43:26     INFO -  PID 11809 | console.debug: SearchEngineSelector: "fetchEngineConfiguration: [e-mail],[e-mail],[e-mail]"
[task 2023-11-02T16:43:26.400Z] 16:43:26  WARNING -  TEST-UNEXPECTED-FAIL | xpcshell.ini:toolkit/components/search/tests/xpcshell/test_engine_selector_application_distribution.js | test_no_distribution_preference - [test_no_distribution_preference : 80] Should have the expected engines for a normal build. - ["[e-mail]","[e-mail]","[e-mail]"] deepEqual ["[e-mail]","[e-mail]","[e-mail]"]
[task 2023-11-02T16:43:26.401Z] 16:43:26     INFO -  /builds/worker/workspace/build/tests/xpcshell/tests/toolkit/components/search/tests/xpcshell/test_engine_selector_application_distribution.js:test_no_distribution_preference:80
[task 2023-11-02T16:43:26.401Z] 16:43:26     INFO -  /builds/worker/workspace/build/tests/xpcshell/head.js:_do_main:245
[task 2023-11-02T16:43:26.402Z] 16:43:26     INFO -  /builds/worker/workspace/build/tests/xpcshell/head.js:_execute_test:592
[task 2023-11-02T16:43:26.403Z] 16:43:26     INFO -  -e:null:1
[task 2023-11-02T16:43:26.403Z] 16:43:26     INFO -  exiting test

Comment 4

[Mark Banner (:standard8)]

Forgot to run tests :(

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/e7dc2508bf17
Ensure the new and old SearchEngineSelectors should always load the correct configuration. r=search-reviewers,mcheang

Comment 6

[Sandor Molnar[:smolnar]]

https://hg.mozilla.org/mozilla-central/rev/e7dc2508bf17