mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove Travis debugging

Browse source
This commit is contained in:
Dan Stillman 2016-11-27 20:02:53 -05:00
parent 45a8178fe0
commit a735d5dd41
4 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/dataDirectory.js
View file

@ -616,8 +616,6 @@ Zotero.DataDirectory = {
} }
// At least the database was copied, but other things failed // At least the database was copied, but other things failed
Zotero.debug(1);
Zotero.debug(errors);
if (errors.length) { if (errors.length) {
let ps = Services.prompt; let ps = Services.prompt;
let buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING) let buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
@ -672,7 +670,6 @@ Zotero.DataDirectory = {
return; return;
} }
} }
Zotero.debug(2);
}), }),

4
test/content/support.js
View file

@ -136,10 +136,6 @@ function waitForDialog(onOpen, button='accept', url) {
else if (button != 'cancel') { else if (button != 'cancel') {
let deferred = Zotero.Promise.defer(); let deferred = Zotero.Promise.defer();
function acceptWhenEnabled() { function acceptWhenEnabled() {
Zotero.debug('=====');
Zotero.debug(button);
Zotero.debug(dialog.document.documentElement.getButton(button));
// Handle delayed buttons // Handle delayed buttons
if (dialog.document.documentElement.getButton(button).disabled) { if (dialog.document.documentElement.getButton(button).disabled) {
dialog.setTimeout(function () { dialog.setTimeout(function () {

7
test/runtests.sh
View file

@ -143,11 +143,8 @@ fi
trap "{ rm -rf \"$TEMPDIR\"; }" EXIT trap "{ rm -rf \"$TEMPDIR\"; }" EXIT
makePath FX_PROFILE "$PROFILE" makePath FX_PROFILE "$PROFILE"
# Temp MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$FX_EXECUTABLE" -profile "$FX_PROFILE" \
#MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$FX_EXECUTABLE" -profile "$FX_PROFILE" \ -chrome chrome://zotero-unit/content/runtests.html -test "$TESTS" -grep "$GREP" -ZoteroTest $FX_ARGS
# -chrome chrome://zotero-unit/content/runtests.html -test "$TESTS" -grep "$GREP" -ZoteroTest $FX_ARGS
MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$FX_EXECUTABLE" -profile "$FX_PROFILE" -bail \
-chrome chrome://zotero-unit/content/runtests.html -test dataDirectory -grep "$GREP" -ZoteroTest $FX_ARGS
# Check for success # Check for success
test -e "$PROFILE/success" test -e "$PROFILE/success"

5
test/tests/dataDirectoryTest.js
View file

@ -145,9 +145,6 @@ describe("Zotero.DataDirectory", function () {
before(function () { before(function () {
disableCommandMode(); disableCommandMode();
// Travis debugging
Zotero.Debug.init(true);
}); });
after(function () { after(function () {
@ -185,7 +182,6 @@ describe("Zotero.DataDirectory", function () {
var promise2; var promise2;
// Click "Try Again" the first time, and then "Show Directories and Quit Zotero" // Click "Try Again" the first time, and then "Show Directories and Quit Zotero"
var promise = waitForDialog(function (dialog) { var promise = waitForDialog(function (dialog) {
Zotero.debug("In first dialog");
promise2 = waitForDialog(null, 'extra1'); promise2 = waitForDialog(null, 'extra1');
// Make sure we're displaying the right message for this mode (automatic or manual) // Make sure we're displaying the right message for this mode (automatic or manual)
@ -199,7 +195,6 @@ describe("Zotero.DataDirectory", function () {
); );
}); });
yield Zotero.DataDirectory.checkForMigration(oldDir, newDir); yield Zotero.DataDirectory.checkForMigration(oldDir, newDir);
Zotero.debug("Before promise 1");
yield promise; yield promise;
yield promise2; yield promise2;