diff options
Diffstat (limited to 'testing')
6 files changed, 28 insertions, 30 deletions
diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js index dbaaf29a8..b1be62519 100644 --- a/testing/mochitest/browser-test.js +++ b/testing/mochitest/browser-test.js @@ -588,7 +588,6 @@ Tester.prototype = { sidebar.setAttribute("src", "about:blank"); SelfSupportBackend.uninit(); - SocialShare.uninit(); } // Destroy BackgroundPageThumbs resources. diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py index 8e908bf43..56a1f0ef7 100644 --- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py +++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py @@ -289,26 +289,45 @@ class SystemResourceMonitor(object): assert self._running assert not self._stopped - self._pipe.send(('terminate',)) + try: + self._pipe.send(('terminate',)) + except Exception: + pass self._running = False self._stopped = True self.measurements = [] - done = False - # The child process will send each data sample over the pipe # as a separate data structure. When it has finished sending # samples, it sends a special "done" message to indicate it # is finished. - while self._pipe.poll(1.0): - start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \ - swap_mem = self._pipe.recv() + + # multiprocessing.Pipe is not actually a pipe on at least Linux. that + # has an effect on the expected outcome of reading from it when the + # other end of the pipe dies, leading to possibly hanging on revc() + # below. So we must poll(). + def poll(): + try: + return self._pipe.poll(0.1) + except Exception: + # Poll might throw an exception even though there's still + # data to read. That happens when the underlying system call + # returns both POLLERR and POLLIN, but python doesn't tell us + # about it. So assume there is something to read, and we'll + # get an exception when trying to read the data. + return True + while poll(): + try: + start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \ + swap_mem = self._pipe.recv() + except Exception: + # Let's assume we're done here + break # There should be nothing after the "done" message so # terminate. if start_time == 'done': - done = True break io = self._io_type(*io_diff) @@ -325,11 +344,6 @@ class SystemResourceMonitor(object): if self._process.is_alive(): self._process.terminate() self._process.join(10) - else: - # We should have received a "done" message from the - # child indicating it shut down properly. This only - # happens if the child shuts down cleanly. - assert done if len(self.measurements): self.start_time = self.measurements[0].start diff --git a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json index 5c97d58f0..211e98e05 100644 --- a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json @@ -648,13 +648,6 @@ "dom/security/test/contentverifier/browser_verify_content_about_newtab.js": 14195, "dom/security/test/contentverifier/browser_verify_content_about_newtab2.js": 12159, "dom/security/test/csp/browser_test_web_manifest.js": 6022, - "dom/security/test/hsts/browser_hsts-priming_allow_active.js": 2840, - "dom/security/test/hsts/browser_hsts-priming_block_active.js": 3459, - "dom/security/test/hsts/browser_hsts-priming_block_active_with_redir_same.js": 3233, - "dom/security/test/hsts/browser_hsts-priming_cache-timeout.js": 3469, - "dom/security/test/hsts/browser_hsts-priming_hsts_after_mixed.js": 2658, - "dom/security/test/hsts/browser_hsts-priming_no-duplicates.js": 3793, - "dom/security/test/hsts/browser_hsts-priming_timeout.js": 4040, "dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js": 3659, "dom/tests/browser/browser_bug396843.js": 6574, "dom/tests/browser/browser_focus_steal_from_chrome.js": 25508, diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json b/testing/runtimes/mochitest-browser-chrome.runtimes.json index ac0b9f10d..73b2437a2 100644 --- a/testing/runtimes/mochitest-browser-chrome.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome.runtimes.json @@ -621,14 +621,6 @@ "dom/security/test/contentverifier/browser_verify_content_about_newtab2.js": 10284, "dom/security/test/csp/browser_manifest-src-override-default-src.js": 1939, "dom/security/test/csp/browser_test_web_manifest.js": 5639, - "dom/security/test/hsts/browser_hsts-priming_allow_active.js": 2280, - "dom/security/test/hsts/browser_hsts-priming_allow_display.js": 1974, - "dom/security/test/hsts/browser_hsts-priming_block_active.js": 2803, - "dom/security/test/hsts/browser_hsts-priming_block_active_with_redir_same.js": 2682, - "dom/security/test/hsts/browser_hsts-priming_cache-timeout.js": 3110, - "dom/security/test/hsts/browser_hsts-priming_hsts_after_mixed.js": 2328, - "dom/security/test/hsts/browser_hsts-priming_no-duplicates.js": 2831, - "dom/security/test/hsts/browser_hsts-priming_timeout.js": 3798, "dom/tests/browser/browser_ConsoleAPITests.js": 3520, "dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js": 2914, "dom/tests/browser/browser_bug396843.js": 6050, diff --git a/testing/web-platform/tests/fetch/api/request/request-init-003.sub.html b/testing/web-platform/tests/fetch/api/request/request-init-003.sub.html index 8860d6074..1f95c5ae9 100644 --- a/testing/web-platform/tests/fetch/api/request/request-init-003.sub.html +++ b/testing/web-platform/tests/fetch/api/request/request-init-003.sub.html @@ -44,7 +44,7 @@ "referrer" : "http://{{host}}:{{ports[http][0]}}/", "referrerPolicy" : "", "mode" : "cors", - "credentials" : "omit", + "credentials" : "same-origin", "cache" : "default", "redirect" : "follow", "integrity" : "", diff --git a/testing/web-platform/tests/fetch/api/request/request-structure.html b/testing/web-platform/tests/fetch/api/request/request-structure.html index cbe6cee99..9494689c7 100644 --- a/testing/web-platform/tests/fetch/api/request/request-structure.html +++ b/testing/web-platform/tests/fetch/api/request/request-structure.html @@ -82,7 +82,7 @@ break; case "credentials": - defaultValue = "omit"; + defaultValue = "same-origin"; newValue = "cors"; break; |