Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 9281f9896ce0 (bug 1048098) for webapi test failures

Browse Source
This commit is contained in:
Ed Morley 2014-08-05 12:22:00 +01:00
parent 734e0ea508
commit 1d0a9269db
5 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/bluetooth/tests/marionette/head.js
View File

@ -705,13 +705,17 @@ function getDefaultAdapter() {
}
/**
* Wait for pending emulator transactions and call |finish()|.
* Flush permission settings and call |finish()|.
*/
function cleanUp() {
// Use ok here so that we have at least one test run.
ok(true, ":: CLEANING UP ::");
waitFor(function() {
SpecialPowers.flushPermissions(function() {
// Use ok here so that we have at least one test run.
ok(true, "permissions flushed");
waitFor(finish, function() {
finish();
});
}, function() {
return pendingEmulatorCmdCount === 0;
});
}

12
dom/bluetooth2/tests/marionette/head.js
View File

@ -626,13 +626,17 @@ function isUuidsEqual(aUuidArray1, aUuidArray2) {
}
/**
* Wait for pending emulator transactions and call |finish()|.
* Flush permission settings and call |finish()|.
*/
function cleanUp() {
// Use ok here so that we have at least one test run.
ok(true, ":: CLEANING UP ::");
waitFor(function() {
SpecialPowers.flushPermissions(function() {
// Use ok here so that we have at least one test run.
ok(true, "permissions flushed");
waitFor(finish, function() {
finish();
});
}, function() {
return pendingEmulatorCmdCount === 0;
});
}

12
dom/cellbroadcast/tests/marionette/head.js
View File

@ -317,13 +317,17 @@ function sendMultipleRawCbsToEmulatorAndWait(aPdus) {
}
/**
* Wait for pending emulator transactions and call |finish()|.
* Flush permission settings and call |finish()|.
*/
function cleanUp() {
// Use ok here so that we have at least one test run.
ok(true, ":: CLEANING UP ::");
waitFor(function() {
SpecialPowers.flushPermissions(function() {
// Use ok here so that we have at least one test run.
ok(true, "permissions flushed");
waitFor(finish, function() {
finish();
});
}, function() {
return pendingEmulatorCmdCount === 0;
});
}

12
dom/mobileconnection/tests/marionette/head.js
View File

@ -1128,13 +1128,17 @@ function getNumOfRadioInterfaces() {
}
/**
* Wait for pending emulator transactions and call |finish()|.
* Flush permission settings and call |finish()|.
*/
function cleanUp() {
// Use ok here so that we have at least one test run.
ok(true, ":: CLEANING UP ::");
waitFor(function() {
SpecialPowers.flushPermissions(function() {
// Use ok here so that we have at least one test run.
ok(true, "permissions flushed");
waitFor(finish, function() {
finish();
});
}, function() {
return _pendingEmulatorCmdCount === 0 &&
_pendingEmulatorShellCmdCount === 0;
});

14
dom/mobilemessage/tests/marionette/head.js
View File

@ -562,12 +562,22 @@ function compareSmsMessage(aFrom, aTo) {
}
/**
* Wait for pending emulator transactions and call |finish()|.
* Flush permission settings and call |finish()|.
*/
function cleanUp() {
ok(true, ":: CLEANING UP ::");
waitFor(finish, function() {
waitFor(function() {
SpecialPowers.flushPermissions(function() {
ok(true, "permissions flushed");
SpecialPowers.flushPrefEnv(function() {
ok(true, "preferences flushed");
finish();
})
});
}, function() {
return pendingEmulatorCmdCount === 0;
});
}