Bug 1299042 - Fix test_safebrowsing_initial_download for OSError. r=maja_zf a=testonly
authorHenrik Skupin <mail@hskupin.info>
Thu, 01 Sep 2016 13:33:49 +0200
changeset 348058 4feb1d04d54dc161d29aaaa960b0117d368645c1
parent 348057 1d2c858ce003f4519dc3ba8ece76c15c65f5e808
child 348059 6b82db7fd2497ca2030119b7f44d450bc76010cb
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf, testonly
bugs1299042
milestone50.0a2
Bug 1299042 - Fix test_safebrowsing_initial_download for OSError. r=maja_zf a=testonly 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
@@ -67,17 +67,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 _: os.path.exists(os.path.join(self.sb_files_path, item)),
                     message='Safe Browsing File: {} not found!'.format(item))