Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 887578 - Make the image xpcshell tests use dynamic httpd ports so they can be run concurrently. r=joe

Browse Source
This commit is contained in:
Mihnea Dobrescu-Balaur 2013-07-09 12:48:50 -07:00
parent 0027d8fb08
commit d0852d2d3f
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
image/test/unit/async_load_tests.js
View File

@ -16,7 +16,8 @@ Cu.import("resource://testing-common/httpd.js");
var server = new HttpServer();
server.registerDirectory("/", do_get_file(''));
server.registerContentType("sjs", "sjs");
server.start(8088);
server.start(-1);
load('image_load_helpers.js');

12
image/test/unit/test_async_notification_404.js
View File

@ -2,7 +2,15 @@
* Test to ensure that load/decode notifications are delivered completely and
* asynchronously when dealing with a file that's a 404.
*/
var ioService = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
var uri = ioService.newURI("http://localhost:8088/async-notification-never-here.jpg", null, null);
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
XPCOMUtils.defineLazyGetter(this, "uri", function() {
return ioService.newURI("http://localhost:" +
server.identity.primaryPort +
"/async-notification-never-here.jpg", null, null);
});
load('async_load_tests.js');

12
image/test/unit/test_private_channel.js
View File

@ -4,13 +4,13 @@ const Ci = Components.interfaces;
var server = new HttpServer();
server.registerPathHandler('/image.png', imageHandler);
server.start(8088);
server.start(-1);
load('image_load_helpers.js');
var gHits = 0;
var gIoService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
var gIoService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
var gPublicLoader = Cc["@mozilla.org/image/loader;1"].createInstance(Ci.imgILoader);
var gPrivateLoader = Cc["@mozilla.org/image/loader;1"].createInstance(Ci.imgILoader);
gPrivateLoader.QueryInterface(Ci.imgICache).respectPrivacyNotifications();
@ -45,7 +45,7 @@ NotificationCallbacks.prototype = {
}
};
var gImgPath = 'http://localhost:8088/image.png';
var gImgPath = 'http://localhost:' + server.identity.primaryPort + '/image.png';
function setup_chan(path, isPrivate, callback) {
var uri = gIoService.newURI(gImgPath, null, null);
@ -53,7 +53,7 @@ function setup_chan(path, isPrivate, callback) {
chan.notificationCallbacks = new NotificationCallbacks(isPrivate);
var channelListener = new ChannelListener();
chan.asyncOpen(channelListener, null);
var listener = new ImageListener(null, callback);
var outlistener = {};
var loader = isPrivate ? gPrivateLoader : gPublicLoader;
@ -74,7 +74,7 @@ function loadImage(isPrivate, callback) {
loadGroup.notificationCallbacks = new NotificationCallbacks(isPrivate);
var loader = isPrivate ? gPrivateLoader : gPublicLoader;
requests.push(loader.loadImageXPCOM(uri, null, null, null, loadGroup, outer, null, 0, null, null));
listener.synchronous = false;
listener.synchronous = false;
}
function run_loadImage_tests() {
@ -105,7 +105,7 @@ function run_test() {
do_register_cleanup(cleanup);
do_test_pending();
// We create a public channel that loads an image, then an identical
// one that should cause a cache read. We then create a private channel
// and load the same image, and do that a second time to ensure a cache