cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #787 from CartoDB/timeoutVectorImage

Browse Source 
Timeout vector image
This commit is contained in:
Simon Martín
2017-11-16 11:01:16 +01:00
committed by GitHub
parent 6aaa5f99e2 298882f410
commit 1aa981d556
7 changed files with 95 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/user-database-timeout-limit.js
+10 -5
View File
@@ -419,18 +419,23 @@ describe('user database timeout limit', function () {
response: {
status: 429,
headers: {
'Content-Type': 'application/json; charset=utf-8'
'Content-Type': 'application/x-protobuf'
}
}
};
this.testClient.getTile(0, 0, 0, params, (err, res, timeoutError) => {
this.testClient.getTile(0, 0, 0, params, (err, res, tile) => {
assert.ifError(err);
assert.deepEqual(timeoutError, DATASOURCE_TIMEOUT_ERROR);
var tileJSON = tile.toJSON();
assert.equal(Array.isArray(tileJSON), true);
assert.equal(tileJSON.length, 2);
assert.equal(tileJSON[0].name, 'errorTileSquareLayer');
assert.equal(tileJSON[1].name, 'errorTileStripesLayer');
done();
});
});
});
});
test/acceptance/user-render-timeout-limit.js
+7 -10
View File
@@ -232,7 +232,7 @@ describe('user render timeout limit', function () {
response: {
status: 429,
headers: {
'Content-Type': 'application/json; charset=utf-8'
'Content-Type': 'application/x-protobuf'
}
}
};
@@ -240,15 +240,12 @@ describe('user render timeout limit', function () {
this.testClient.getTile(0, 0, 0, params, (err, res, tile) => {
assert.ifError(err);
assert.deepEqual(tile, {
errors: ['You are over platform\'s limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'You are over platform\'s limits. Please contact us to know more details'
}]
});
var tileJSON = tile.toJSON();
assert.equal(Array.isArray(tileJSON), true);
assert.equal(tileJSON.length, 2);
assert.equal(tileJSON[0].name, 'errorTileSquareLayer');
assert.equal(tileJSON[1].name, 'errorTileStripesLayer');
done();
});
});