mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-10 20:09:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix selendroid command timeout bug and fix test that proves it work

Browse Source
This commit is contained in:
Jonathan Lipps
2014-04-09 13:13:08 -07:00
parent 0d792be080
commit d566b7583f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/server/controller.js
View File

@@ -29,6 +29,11 @@ exports.getGlobalBeforeFilter = function (appium) {
logger.debug("Request received with params: " + JSON.stringify(req.body));
}
if (proxy.shouldProxy(req)) {
if (req.appium.commandTimeout) {
// if we're proxying, we never get into the sessionBeforeFilter,
// so let's make sure to reset the timeout on every request still
req.appium.resetTimeout();
}
if (typeof req.device.translatePath !== "undefined") {
req.device.translatePath(req);
}

8
test/functional/selendroid/basic-specs.js
View File

@@ -113,7 +113,7 @@ describe('selendroid - basic -', function () {
describe('command timeouts', function () {
var driver;
setup(this, _.defaults({newCommandTimeout: 7}, desired))
setup(this, _.defaults({newCommandTimeout: 3}, desired))
.then(function (d) { driver = d; });
it('should not die if commands come in', function (done) {
@@ -126,11 +126,7 @@ describe('selendroid - basic -', function () {
.then(find);
} else return new Q();
};
find().then(function () {
return driver
.sleep(10000)
.elementByName('Animation').should.be.rejected;
}).nodeify(done);
find().nodeify(done);
});
});