Bug 1330253 - Enable test_safe_browsing_initial_download on try. r=dustin,whimboo

MozReview-Commit-ID: 7SruSkfIhzI

--HG--
extra : rebase_source : 9f5f7e0b565221b77b8b2c67150cdb65868cfb02
This commit is contained in:
Francois Marier 2017-01-13 14:11:19 -08:00
Родитель 4b01ef1dc0
Коммит e2209860d7
5 изменённых файлов: 6 добавлений и 10 удалений

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

@ -10,6 +10,7 @@ tags = local
[test_no_certificate.py]
tags = local
[test_safe_browsing_initial_download.py]
skip-if = debug # the GAPI key isn't available in debug builds
[test_safe_browsing_notification.py]
[test_safe_browsing_warning_pages.py]
[test_security_notification.py]

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

@ -33,9 +33,7 @@ class TestSafeBrowsingInitialDownload(PuppeteerMixin, MarionetteTestCase):
prefs_provider_update_time = {
# Force an immediate download of the safebrowsing files
# Bug 1330253 - Leave the next line disabled until we have google API key
# on the CI machines.
# 'browser.safebrowsing.provider.google4.nextupdatetime': 1,
'browser.safebrowsing.provider.google4.nextupdatetime': 1,
'browser.safebrowsing.provider.google.nextupdatetime': 1,
'browser.safebrowsing.provider.mozilla.nextupdatetime': 1,
}
@ -80,10 +78,7 @@ class TestSafeBrowsingInitialDownload(PuppeteerMixin, MarionetteTestCase):
self.safebrowsing_path = os.path.join(self.marionette.instance.profile.profile,
'safebrowsing')
self.safebrowsing_v2_files = self.get_safebrowsing_files(False)
# Bug 1330253 - Leave the next line disabled until we have google API key
# on the CI machines.
# self.safebrowsing_v4_files = self.get_safebrowsing_files(True)
self.safebrowsing_v4_files = []
self.safebrowsing_v4_files = self.get_safebrowsing_files(True)
def tearDown(self):
try:

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

@ -47,7 +47,7 @@ config = {
'secret_files': [
{'filename': '/builds/gapi.data',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
'min_scm_level': 1},
{'filename': '/builds/mozilla-desktop-geoloc-api.key',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},

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

@ -46,7 +46,7 @@ config = {
'secret_files': [
{'filename': '/builds/gapi.data',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
'min_scm_level': 1},
{'filename': '/builds/mozilla-desktop-geoloc-api.key',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},

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

@ -57,7 +57,7 @@ class SecretsMixin(object):
filename = sf['filename']
secret_name = sf['secret_name'] % subst
min_scm_level = sf.get('min_scm_level', 0)
if scm_level <= min_scm_level:
if scm_level < min_scm_level:
if 'default' in sf:
self.info("Using default value for " + filename)
secret = sf['default']