Use version-specific prefs files when running Firefox #10443
Conversation
tools/wpt/browser.py
Outdated
| return None, "nightly" | ||
| version, status = m.groups() | ||
| channel = {"a": "nightly", "b": "beta", None: "stable"} | ||
| return version, channel.get(status, "stable") |
There was a problem hiding this comment.
I don't know which of the two approaches to defining the default value is more Pythonic, but I don't think we need them both.
| else: | ||
| # Always use tip as the tag for nightly; this isn't quite right | ||
| # but to do better we need the actual build revision, which we | ||
| # can get if we have an application.ini file |
There was a problem hiding this comment.
This hint for future improvement is appreciated!
| f.write(resp.content) | ||
| else: | ||
| print("Using cached test prefs from %s" % cache_file) |
There was a problem hiding this comment.
We have a logger instance in this file. Mind using that instead?
tools/wpt/browser.py
Outdated
| @@ -1,4 +1,5 @@ | |||
| import logging | |||
| import glob | |||
There was a problem hiding this comment.
This line may be removed
Firefox requires a prefs file to be loaded to ensure that it doesn't make external network connections, and to make sure that other settings are appropriate for testing. Previously we always used the version of the prefs file from master, which is usually fine for nightly builds, but doesn't work with release builds if it happens that a pref changed. This change uses the correct release version of the prefs file for firefox releases and beta versions. It continues to use the master version for any nightly build; this could be fixed in some cases if we are able to access the actual commit hash used to build Firefox, but probably isn't too bad an approximation. The caching algorithm was changed so that release versions of the prefs are cached forever, and the nightly version is updated once per day (although this doesn't quite match the nightly release cadence, it's only going to fail in edge cases where the prefs were changed in the file, but the nightly version was not yet updated, of vice-versa.)
jgraham
force-pushed
the
firefox_branch_prefs
branch
from
593dea5
to
0c93c08
Compare
|
I fixed everything apart from the logger thing, which seems to be a little complicated. I need to remember what we do to make the stdlib logger work from mozlog, because at the moment it's looking pretty broken to me, but then it works later so I guess I'm missing something. I think we should do that in a followup since it's not really a change in this PR (we were using |
Works for me. Could you add a link here when you do? |
There was a problem hiding this comment.
Tested locally with Firefox version 59.0.2 and Firefox Nightly. Prior to application of the patch, version 59.0.2 consistently fails due to its making network requests on startup. After applying the patch, these requests are correctly disabled for both versions.
Thanks, @jgraham!
Firefox requires a prefs file to be loaded to ensure that it doesn't
make external network connections, and to make sure that other
settings are appropriate for testing. Previously we always used the
version of the prefs file from master, which is usually fine for
nightly builds, but doesn't work with release builds if it happens
that a pref changed.
This change uses the correct release version of the prefs file for
firefox releases and beta versions. It continues to use the master
version for any nightly build; this could be fixed in some cases if we
are able to access the actual commit hash used to build Firefox, but
probably isn't too bad an approximation.
The caching algorithm was changed so that release versions of the
prefs are cached forever, and the nightly version is updated once per
day (although this doesn't quite match the nightly release cadence,
it's only going to fail in edge cases where the prefs were changed in
the file, but the nightly version was not yet updated, of vice-versa.)
This change is