From e6d6a4346d3ae717f77400b788d28101f74895d1 Mon Sep 17 00:00:00 2001 From: Steven Englehardt Date: Sat, 4 Jan 2020 07:35:01 +0000 Subject: [PATCH] Bug 1605550 - Narrow the filter for Safebrowsing files to avoid collisions r=marionette-reviewers,dimi,whimboo Differential Revision: https://phabricator.services.mozilla.com/D58586 --HG-- extra : moz-landing-system : lando --- .../tests/functional/safebrowsing/test_initial_download.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testing/firefox-ui/tests/functional/safebrowsing/test_initial_download.py b/testing/firefox-ui/tests/functional/safebrowsing/test_initial_download.py index cd48e40bf7c0..a52c457c0c9c 100644 --- a/testing/firefox-ui/tests/functional/safebrowsing/test_initial_download.py +++ b/testing/firefox-ui/tests/functional/safebrowsing/test_initial_download.py @@ -71,13 +71,15 @@ class TestSafeBrowsingInitialDownload(PuppeteerMixin, MarionetteTestCase): super(TestSafeBrowsingInitialDownload, self).setUp() self.safebrowsing_v2_files = self.get_safebrowsing_files(False) - if any(f.startswith('goog') for f in self.safebrowsing_v2_files): + if any(f.startswith('goog-') or f.startswith('googpub-') + for f in self.safebrowsing_v2_files): self.prefs_provider_update_time.update({ 'browser.safebrowsing.provider.google.nextupdatetime': 1, }) self.safebrowsing_v4_files = self.get_safebrowsing_files(True) - if any(f.startswith('goog') for f in self.safebrowsing_v4_files): + if any(f.startswith('goog-') or f.startswith('googpub-') + for f in self.safebrowsing_v4_files): self.prefs_provider_update_time.update({ 'browser.safebrowsing.provider.google4.nextupdatetime': 1, })