www

commit 45a8178fe0c4dd1bf20e05d3321f1a929efc8a60
parent 837ae0444d7f54e5ba915b03aa6d9b87f6f2de11
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 27 Nov 2016 20:00:10 -0500

Add another DirectoryIterator entry.isDir workaround for Travis

Diffstat:
M
chrome/content/zotero/xpcom/file.js
 | 
6
++++++

1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js
@@ -544,6 +544,12 @@ Zotero.File = new function(){
 					let entry = yield iterator.next();
 					let dest = newDir + entry.path.substr(rootDir.length);
 					
+					// entry.isDir can be false for some reason on Travis, causing spurious test failures
+					if (Zotero.automatedTest && !entry.isDir && (yield OS.File.stat(entry.path)).isDir) {
+						Zotero.debug("Overriding isDir for " + entry.path);
+						entry.isDir = true;
+					}
+					
 					// Move files in directory
 					if (!entry.isDir) {
 						try {