From a735d5dd41d3ba5299584e7d1b4f07a86c2229d1 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 27 Nov 2016 20:02:53 -0500 Subject: [PATCH] Remove Travis debugging --- chrome/content/zotero/xpcom/dataDirectory.js | 3 --- test/content/support.js | 4 ---- test/runtests.sh | 7 ++----- test/tests/dataDirectoryTest.js | 5 ----- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/chrome/content/zotero/xpcom/dataDirectory.js b/chrome/content/zotero/xpcom/dataDirectory.js index 51abef0613..6545910c8b 100644 --- a/chrome/content/zotero/xpcom/dataDirectory.js +++ b/chrome/content/zotero/xpcom/dataDirectory.js @@ -616,8 +616,6 @@ Zotero.DataDirectory = { } // At least the database was copied, but other things failed - Zotero.debug(1); - Zotero.debug(errors); if (errors.length) { let ps = Services.prompt; let buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING) @@ -672,7 +670,6 @@ Zotero.DataDirectory = { return; } } - Zotero.debug(2); }), diff --git a/test/content/support.js b/test/content/support.js index c946444ae6..2bb825aecb 100644 --- a/test/content/support.js +++ b/test/content/support.js @@ -136,10 +136,6 @@ function waitForDialog(onOpen, button='accept', url) { else if (button != 'cancel') { let deferred = Zotero.Promise.defer(); function acceptWhenEnabled() { - Zotero.debug('====='); - Zotero.debug(button); - Zotero.debug(dialog.document.documentElement.getButton(button)); - // Handle delayed buttons if (dialog.document.documentElement.getButton(button).disabled) { dialog.setTimeout(function () { diff --git a/test/runtests.sh b/test/runtests.sh index 4ce4ff7e93..bdf24da954 100755 --- a/test/runtests.sh +++ b/test/runtests.sh @@ -143,11 +143,8 @@ fi trap "{ rm -rf \"$TEMPDIR\"; }" EXIT makePath FX_PROFILE "$PROFILE" -# Temp -#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 -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 +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 # Check for success test -e "$PROFILE/success" diff --git a/test/tests/dataDirectoryTest.js b/test/tests/dataDirectoryTest.js index 416f11067c..638ad790c0 100644 --- a/test/tests/dataDirectoryTest.js +++ b/test/tests/dataDirectoryTest.js @@ -145,9 +145,6 @@ describe("Zotero.DataDirectory", function () { before(function () { disableCommandMode(); - - // Travis debugging - Zotero.Debug.init(true); }); after(function () { @@ -185,7 +182,6 @@ describe("Zotero.DataDirectory", function () { var promise2; // Click "Try Again" the first time, and then "Show Directories and Quit Zotero" var promise = waitForDialog(function (dialog) { - Zotero.debug("In first dialog"); promise2 = waitForDialog(null, 'extra1'); // 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); - Zotero.debug("Before promise 1"); yield promise; yield promise2;