Backing out b94c916122c8 (bug 1021612) for sudden windows xpcshell failures, r=backout
authorHonza Bambas <honzab.moz@firemni.cz>
Tue, 08 Jul 2014 19:01:46 +0200
changeset 192866 e185bf9449f60b5483d1cfbee126967b70be4f57
parent 192865 ea72e2c9debe3c8101d6787997010f6bdcb3f3e6
child 192867 d35c1bf0f084b965970ccf3b9a1393082012b8dd
child 192974 12d48efc89eb9dbf4e5dffb5053f8d21ae3285a1
push id7663
push userkwierso@gmail.com
push dateWed, 09 Jul 2014 03:08:08 +0000
treeherderfx-team@48de6f4f82af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1021612
milestone33.0a1
Backing out b94c916122c8 (bug 1021612) for sudden windows xpcshell failures, r=backout
netwerk/test/unit/data/4k-cache-file
netwerk/test/unit/test_bug1021612.js
netwerk/test/unit/xpcshell.ini
deleted file mode 100644
index ce66cc9e78f544a46c4a0541e95111515ada0c4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/netwerk/test/unit/test_bug1021612.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Bug 1021612 test.
- */
-
-function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel(url, "", null);
-}
-
-function checkSuccess(request, buffer)
-{
-  var body = '';
-  for (var i = 0; i < 3786; ++i)
-    body += '.';
-
-  do_check_eq(buffer, body);
-  do_test_finished();
-}
-
-function run_test()
-{
-  var profile = do_get_profile();
-  profile.append('cache2');
-  profile.append('entries');
-  var testFile = do_get_file('../unit/data/4k-cache-file');
-  testFile.copyTo(profile, '895F51A24BCC63EE6D69B3AAF0007975F33708A7');
-  var chan = make_channel('http://localhost/4k-cache-file.php');
-  chan.loadFlags = chan.loadFlags | Ci.nsIRequest.LOAD_FROM_CACHE;
-  chan.asyncOpen(new ChannelListener(checkSuccess, null),
-                 null);
-  do_test_pending();
-}
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -1,13 +1,12 @@
 [DEFAULT]
 head = head_channels.js head_cache.js head_cache2.js
 tail =
 support-files =
-  data/4k-cache-file
   data/image.png
   data/system_root.lnk
   data/test_psl.txt
   data/test_readline1.txt
   data/test_readline2.txt
   data/test_readline3.txt
   data/test_readline4.txt
   data/test_readline5.txt
@@ -184,17 +183,16 @@ skip-if = os == "android"
 skip-if = os == "android"
 [test_bug712914_secinfo_validation.js]
 [test_bug770243.js]
 [test_bug894586.js]
 # Allocating 4GB might actually succeed on 64 bit machines
 skip-if = bits != 32
 [test_bug935499.js]
 [test_bug952927.js]
-[test_bug1021612.js]
 [test_doomentry.js]
 [test_cacheflags.js]
 # Bug 675039: intermittent fail on Android-armv6 
 skip-if = os == "android"
 [test_cache_jar.js]
 [test_channel_close.js]
 [test_compareURIs.js]
 [test_compressappend.js]