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

Merge pull request #1048 from adomasven/fix/linux-test-failures

Browse source 
Fixes freezing occuring on linux while running tests
This commit is contained in:
Dan Stillman 2016-06-25 07:30:35 -04:00 • committed by GitHub
commit 7e5b46b146
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/content/support.js
View file

@ -137,7 +137,7 @@ function waitForDialog(onOpen, button='accept', url) {
function acceptWhenEnabled() { function acceptWhenEnabled() {
// Handle delayed buttons // Handle delayed buttons
if (dialog.document.documentElement.getButton(button).disabled) { if (dialog.document.documentElement.getButton(button).disabled) {
setTimeout(function () { dialog.setTimeout(function () {
acceptWhenEnabled(); acceptWhenEnabled();
}, 250); }, 250);
} }

4
test/tests/server_connectorTest.js
View file

@ -14,10 +14,12 @@ describe("Connector Server", function () {
win = yield loadZoteroPane(); win = yield loadZoteroPane();
connectorServerPath = 'http://127.0.0.1:' + Zotero.Prefs.get('httpServer.port'); connectorServerPath = 'http://127.0.0.1:' + Zotero.Prefs.get('httpServer.port');
testServerPath = 'http://127.0.0.1:' + testServerPort;
}); });
beforeEach(function () { beforeEach(function () {
// Alternate ports to prevent exceptions not catchable in JS
testServerPort += (testServerPort & 1) ? 1 : -1;
testServerPath = 'http://127.0.0.1:' + testServerPort;
httpd = new HttpServer(); httpd = new HttpServer();
httpd.start(testServerPort); httpd.start(testServerPort);
}); });