зеркало из https://github.com/mozilla/normandy.git
Merge #2333
2333: Remove check about Remote Settings version r=tiftran a=leplatrem Co-authored-by: Mathieu Leplatre <mathieu@mozilla.com>
This commit is contained in:
Коммит
de9221f9b4
|
@ -122,10 +122,6 @@ class RemoteSettings:
|
||||||
if "signer" in capabilities:
|
if "signer" in capabilities:
|
||||||
signer_config = capabilities["signer"]
|
signer_config = capabilities["signer"]
|
||||||
|
|
||||||
# Since we use the rollback feature, make sure it's available.
|
|
||||||
if signer_config["version"] < "5.1.0":
|
|
||||||
raise ImproperlyConfigured("kinto-signer 5.1.0+ is required")
|
|
||||||
|
|
||||||
normandy_resource = [
|
normandy_resource = [
|
||||||
r
|
r
|
||||||
for r in signer_config["resources"]
|
for r in signer_config["resources"]
|
||||||
|
|
|
@ -152,18 +152,6 @@ class TestRemoteSettings:
|
||||||
# restore write permissions
|
# restore write permissions
|
||||||
requestsmock.get(collection_url, json=allow_write_payload)
|
requestsmock.get(collection_url, json=allow_write_payload)
|
||||||
|
|
||||||
# Signer version should be >= 5.1.0.
|
|
||||||
requestsmock.get(
|
|
||||||
f"{rs_settings.REMOTE_SETTINGS_URL}/",
|
|
||||||
json={
|
|
||||||
"user": {"id": f"account:{rs_settings.REMOTE_SETTINGS_USERNAME}"},
|
|
||||||
"capabilities": {"signer": {"version": "5.0.0"}},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
with pytest.raises(ImproperlyConfigured) as exc:
|
|
||||||
exports.RemoteSettings().check_config()
|
|
||||||
assert "kinto-signer 5.1.0+ is required" in str(exc.value)
|
|
||||||
|
|
||||||
# Capabilities collection review should be explicitly disabled.
|
# Capabilities collection review should be explicitly disabled.
|
||||||
requestsmock.get(
|
requestsmock.get(
|
||||||
f"{rs_settings.REMOTE_SETTINGS_URL}/",
|
f"{rs_settings.REMOTE_SETTINGS_URL}/",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче