1604929 - Correct multiple locale handling and telemetry Ids in the modern configuration

Status: RESOLVED FIXED

(Firefox :: Search, task, P1)

Description

[Mark Banner (:standard8)]

When starting the comparison of ABSearch and modernisation, I noticed a couple of issues with the current code.

Firstly, wikipedia-be was coming out with an identifier of -be and other engines were affected in a similar way.

I discovered that telemetryId was in engineParams, but undefined in getEngineParams, this would cause the short name to be undefined. However, the SearchEngine initialiser, would then take the name of the engine, and sanitize it into a short name. As the wikipedia-be is largely a non-ASCII name, it came out with -be.

Secondly I discovered that wikipedia-be-tarask was being duplicated twice - when it was meant to be wikipedia-be and wikipedia-be-tarask. This was due to attempting to duplicate the engine configurations, but not also duplicating the webExtension object within the configuration.

Comment 1

[Mark Banner (:standard8)]

Attachment: Bug 1604929 - Move search's data/search-extensions to a slightly more descriptive and generic name. r?mikedeboer

Also drops the bug645970 naming as we don't really need to reference that bug number any more.

Comment 2

[Mark Banner (:standard8)]

Attachment: Bug 1604929 - Remove engineName from test engines.json files since the parameter was removed in bug 1592209. r?mikedeboer

Depends on D57680

Comment 3

[Mark Banner (:standard8)]

Attachment: Bug 1604929 - In the modern search config, fix handling of telemetry Ids and WebExtensions which are installed twice with different locales. r?mikedeboer

Depends on D57681

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/897fef11fe80
Move search's data/search-extensions to a slightly more descriptive and generic name. r=mikedeboer
https://hg.mozilla.org/integration/autoland/rev/030684aff17b
Remove engineName from test engines.json files since the parameter was removed in bug 1592209. r=mikedeboer
https://hg.mozilla.org/integration/autoland/rev/8a36d9f67974
In the modern search config, fix handling of telemetry Ids and WebExtensions which are installed twice with different locales. r=mikedeboer

Comment 5

[Andreea Pavel [:apavel]]

Backe dout for failing xpcshell at /test_async_addon.js

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&selectedJob=281969162&resultStatus=testfailed%2Cbusted%2Cexception&revision=8a36d9f679745d3a40a5a021a92a85dfba0c5a29

Failure log: https://treeherder.mozilla.org/logviewer.html#?job_id=281969162&repo=autoland

Tier1 failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=281968057&repo=autoland&lineNumber=2966

Backout: https://hg.mozilla.org/integration/autoland/rev/3a4c835fe50cc8e47e636f5feeaac95322c2faeb

Comment 6

[Mark Banner (:standard8)]

Ok, found the issue, the test wasn't running in my normal way as for some reason it was tagged with "addons". This is the only test in the directory that is tagged with that, and there's plenty of other tests running with add-ons, so I've removed the tag.

Fixing the test was simple, just taking account of the changes made to the engines list for simple-engines.

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/67971490febd
Move search's data/search-extensions to a slightly more descriptive and generic name. r=mikedeboer
https://hg.mozilla.org/integration/autoland/rev/c1b33298b257
Remove engineName from test engines.json files since the parameter was removed in bug 1592209. r=mikedeboer
https://hg.mozilla.org/integration/autoland/rev/f14ef3dcca4a
In the modern search config, fix handling of telemetry Ids and WebExtensions which are installed twice with different locales. r=mikedeboer

Comment 8

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/67971490febd
https://hg.mozilla.org/mozilla-central/rev/c1b33298b257
https://hg.mozilla.org/mozilla-central/rev/f14ef3dcca4a