From 837ae0444d7f54e5ba915b03aa6d9b87f6f2de11 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 27 Nov 2016 19:51:48 -0500 Subject: [PATCH] Travis debugging --- chrome/content/zotero/xpcom/dataDirectory.js | 3 +++ test/runtests.sh | 7 +++++-- test/tests/dataDirectoryTest.js | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/dataDirectory.js b/chrome/content/zotero/xpcom/dataDirectory.js index 6545910c8b..51abef0613 100644 --- a/chrome/content/zotero/xpcom/dataDirectory.js +++ b/chrome/content/zotero/xpcom/dataDirectory.js @@ -616,6 +616,8 @@ 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) @@ -670,6 +672,7 @@ Zotero.DataDirectory = { return; } } + Zotero.debug(2); }), diff --git a/test/runtests.sh b/test/runtests.sh index bdf24da954..4ce4ff7e93 100755 --- a/test/runtests.sh +++ b/test/runtests.sh @@ -143,8 +143,11 @@ fi trap "{ rm -rf \"$TEMPDIR\"; }" EXIT makePath FX_PROFILE "$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 +# 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 # Check for success test -e "$PROFILE/success" diff --git a/test/tests/dataDirectoryTest.js b/test/tests/dataDirectoryTest.js index f62cedf0de..416f11067c 100644 --- a/test/tests/dataDirectoryTest.js +++ b/test/tests/dataDirectoryTest.js @@ -199,6 +199,7 @@ describe("Zotero.DataDirectory", function () { ); }); yield Zotero.DataDirectory.checkForMigration(oldDir, newDir); + Zotero.debug("Before promise 1"); yield promise; yield promise2;