Bug 1398941 - test_race_cache_with_network.js test is failing after landing bug 1398847, r=valentin
authorMichal Novotny <michal.novotny@gmail.com>
Tue, 12 Sep 2017 13:06:58 +0200
changeset 429777 adeb5c68179fe34d95b143b7252112dc950cc720
parent 429776 bab465c74656f2ef556f3bc72ff1cce13f05b1c4
child 429778 c20f3c9a4a9b47a912b7ca541f5cb474d2f2e5fb
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin
bugs1398941, 1398847
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1398941 - test_race_cache_with_network.js test is failing after landing bug 1398847, r=valentin
netwerk/test/unit/test_race_cache_with_network.js
netwerk/test/unit/xpcshell.ini
--- a/netwerk/test/unit/test_race_cache_with_network.js
+++ b/netwerk/test/unit/test_race_cache_with_network.js
@@ -133,17 +133,17 @@ function *testSteps() {
   // Sets a high delay for the cache fetch, and triggers the network activity.
   // While the network response is produced, we trigger the cache fetch.
   // Because the network response was the first, a non-conditional request is sent.
   var channel = make_channel("http://localhost:" + PORT + "/rcwn");
   channel.QueryInterface(Components.interfaces.nsIRaceCacheWithNetwork).test_delayCacheEntryOpeningBy(100000);
   channel.asyncOpen2(new ChannelListener(checkContent, null));
   do_timeout(50, function() {
     channel.QueryInterface(Components.interfaces.nsIRaceCacheWithNetwork).test_triggerNetwork(0);
-    channel.QueryInterface(Components.interfaces.nsIRaceCacheWithNetwork).test_triggerDelayedOpenCacheEntry();
+    do_execute_soon(() => { channel.QueryInterface(Components.interfaces.nsIRaceCacheWithNetwork).test_triggerDelayedOpenCacheEntry(); });
   });
   yield undefined;
   equal(gResponseCounter, 6);
   equal(g200Counter, 3, "check number of 200 responses");
   equal(g304Counter, 3, "check number of 304 responses");
 
   // Triggers cache open before triggering network.
   var channel = make_channel("http://localhost:" + PORT + "/rcwn");
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -385,18 +385,16 @@ skip-if = os == "android"
 [test_bug1279246.js]
 [test_throttlequeue.js]
 [test_throttlechannel.js]
 [test_throttling.js]
 [test_separate_connections.js]
 [test_rusturl.js]
 [test_trackingProtection_annotateChannels.js]
 [test_race_cache_with_network.js]
-# temporarily disabled because it is failing after landing bug 1398847
-skip-if = true
 [test_channel_priority.js]
 [test_bug1312774_http1.js]
 [test_1351443-missing-NewChannel2.js]
 [test_bug1312782_http1.js]
 [test_bug1355539_http1.js]
 [test_bug1378385_http1.js]
 [test_tls_flags_separate_connections.js]
 [test_tls_flags.js]