Bug 1670631 - browsertime keeps on reinstalling itself r=sparky

Let's use `_from` instead of `_resolved`

Differential Revision: https://phabricator.services.mozilla.com/D93629
This commit is contained in:
Tarek Ziadé 2020-10-15 14:07:09 +00:00
Родитель 447fc3d66a
Коммит f3c2b155b5
2 изменённых файлов: 27 добавлений и 3 удалений

Просмотреть файл

@ -146,7 +146,7 @@ class BrowsertimeRunner(NodeRunner):
old_pkg = json.load(old)
new_pkg = json.load(new)
return old_pkg["_resolved"] != new_pkg["devDependencies"]["browsertime"]
return not old_pkg["_from"].endswith(new_pkg["devDependencies"]["browsertime"])
def setup(self):
"""Install browsertime and visualmetrics.py prerequisites and the Node.js package."""

Просмотреть файл

@ -126,7 +126,19 @@ def test_browsertime_no_reinstall():
with mock.patch(
"mozperftest.test.browsertime.runner.pathlib.Path.open",
build_mock_open(
[{"devDependencies": {"browsertime": "good"}}, {"_resolved": "good"}]
[
{
"devDependencies": {
"browsertime": "89771a1d6be54114db190427dbc281582cba3d47"
}
},
{
"_from": (
"browsertime@https://github.com/sitespeedio/browsertime"
"/tarball/89771a1d6be54114db190427dbc281582cba3d47"
)
},
]
),
), mock.patch("mozperftest.test.browsertime.runner.json.load", new=mocked_jsonload):
browser = env.layers[TEST]
@ -150,7 +162,19 @@ def test_browsertime_should_reinstall():
with mock.patch(
"mozperftest.test.browsertime.runner.pathlib.Path.open",
build_mock_open(
[{"devDependencies": {"browsertime": "bad"}}, {"_resolved": "good"}]
[
{
"devDependencies": {
"browsertime": "89771a1d6be54114db190427dbc281582cba3d47"
}
},
{
"_from": (
"browsertime@https://github.com/sitespeedio/browsertime"
"/tarball/98747854be54114db190427dbc281582cba3d47"
)
},
]
),
), mock.patch("mozperftest.test.browsertime.runner.json.load", new=mocked_jsonload):
browser = env.layers[TEST]