Bug 1299042 - Fix test_safebrowsing_initial_download for OSError. r=maja_zf
authorHenrik Skupin <mail@hskupin.info>
Thu, 01 Sep 2016 13:33:49 +0200
changeset 312335 4686f24bce9724843410be75b309896d50ff33ea
parent 312334 4c0092cbaf251d6253a07f103cabf8b2b1fbb9fc
child 312336 eeba75f09439f139fd21d7f62d47b60884b7a179
push id20447
push userkwierso@gmail.com
push dateFri, 02 Sep 2016 20:36:44 +0000
treeherderfx-team@969397f22187 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf
bugs1299042
milestone51.0a1
Bug 1299042 - Fix test_safebrowsing_initial_download for OSError. r=maja_zf MozReview-Commit-ID: 1ChV6HHXYg2
testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py
--- a/testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py
+++ b/testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py
@@ -60,17 +60,18 @@ class TestSafeBrowsingInitialDownload(Fi
 
     def tearDown(self):
         try:
             self.restart(clean=True)
         finally:
             FirefoxTestCase.tearDown(self)
 
     def test_safe_browsing_initial_download(self):
-        wait = Wait(self.marionette, timeout=self.browser.timeout_page_load)
+        wait = Wait(self.marionette, timeout=self.browser.timeout_page_load,
+                    ignored_exceptions=[OSError])
 
         for data in self.test_data:
             if self.platform not in data['platforms']:
                 continue
             for item in data['files']:
                 wait.until(
                     lambda _: [f for f in os.listdir(self.sb_files_path) if re.search(item, f)],
                     message='Safe Browsing File: {} not found!'.format(item))