mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge fix for bug 623812. a=orange

This commit is contained in:
Philipp von Weitershausen 2011-01-06 23:58:24 -08:00
Родитель 54ff7ba2cf 60746583c2
Коммит c800693a83
1 изменённых файлов: 6 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
services/sync/tests/unit/test_resource_async.js
Просмотреть файл

@ -608,6 +608,7 @@ function run_test() {
_("Removing the observer should result in the original 401"); _("Removing the observer should result in the original 401");
did401 = false; did401 = false;
do_test_pending();
let res13 = new AsyncResource("http://localhost:8080/protected"); let res13 = new AsyncResource("http://localhost:8080/protected");
res13.get(ensureThrows(function (error, content) { res13.get(ensureThrows(function (error, content) {
do_check_eq(error, null); do_check_eq(error, null);
@ -622,6 +623,7 @@ function run_test() {
}, function (next) { }, function (next) {
_("Exception handling inside fetches."); _("Exception handling inside fetches.");
do_test_pending();
let res14 = new AsyncResource("http://localhost:8080/json"); let res14 = new AsyncResource("http://localhost:8080/json");
res14._onProgress = function(rec) { res14._onProgress = function(rec) {
// Provoke an XPC exception without a Javascript wrapper. // Provoke an XPC exception without a Javascript wrapper.
@ -631,10 +633,7 @@ function run_test() {
res14._log.warn = function(msg) { warnings.push(msg) }; res14._log.warn = function(msg) { warnings.push(msg) };
res14.get(ensureThrows(function (error, content) { res14.get(ensureThrows(function (error, content) {
// Check fails on Windows and build box Mac; returns NS_ERROR_ABORT do_check_eq(error, "Error: NS_ERROR_MALFORMED_URI");
// instead of NS_ERROR_MALFORMED_URI. See Bug 623812.
// TODO: figure out why!
//do_check_eq(error, "Error: NS_ERROR_MALFORMED_URI");
do_check_eq(content, null); do_check_eq(content, null);
do_check_eq(warnings.pop(), do_check_eq(warnings.pop(),
"Got exception calling onProgress handler during fetch of " + "Got exception calling onProgress handler during fetch of " +
@ -647,18 +646,16 @@ function run_test() {
}, function (next) { }, function (next) {
_("JS exception handling inside fetches."); _("JS exception handling inside fetches.");
do_test_pending();
let res15 = new AsyncResource("http://localhost:8080/json"); let res15 = new AsyncResource("http://localhost:8080/json");
res15._onProgress = function(rec) { res15._onProgress = function(rec) {
throw "BOO!"; throw "BOO!";
}; };
warnings = []; let warnings = [];
res15._log.warn = function(msg) { warnings.push(msg) }; res15._log.warn = function(msg) { warnings.push(msg) };
res15.get(ensureThrows(function (error, content) { res15.get(ensureThrows(function (error, content) {
// Check fails on Windows and build box Mac; returns NS_ERROR_ABORT do_check_eq(error, "Error: NS_ERROR_XPC_JS_THREW_STRING");
// instead of NS_ERROR_XPC_JS_THREW_STRING. See Bug 623812.
// TODO: figure out why!
// do_check_eq(error, "Error: NS_ERROR_XPC_JS_THREW_STRING");
do_check_eq(content, null); do_check_eq(content, null);
do_check_eq(warnings.pop(), do_check_eq(warnings.pop(),
"Got exception calling onProgress handler during fetch of " + "Got exception calling onProgress handler during fetch of " +