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

Improve timeout error message

Browse Source
This commit is contained in:
Daniel García Aubert
2017-07-31 20:07:31 +02:00
parent 1fdc0621e7
commit 44fc34b1ce
4 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/limits.js
+8 -4
View File
@@ -102,11 +102,13 @@ describe('render limits', function() {
assert.response(server,
createRequest(layergroup, user),
{
status: 400
status: 429
},
function(res) {
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed.errors, [ 'Render timed out' ]);
assert.deepEqual(parsed.errors, [
'You are over platform limits. Please contact us to know more details'
]);
done();
}
);
@@ -167,11 +169,13 @@ describe('render limits', function() {
encoding: 'binary'
},
{
status: 400
status: 429
},
function(res) {
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed.errors, ['Render timed out']);
assert.deepEqual(parsed.errors, [
'You are over platform limits. Please contact us to know more details'
]);
done();
}
);
test/acceptance/user-database-timeout-limit.js
+10 -10
View File
@@ -86,11 +86,11 @@ describe('user database timeout limit', function () {
assert.ifError(err);
assert.deepEqual(dataview, {
errors: ['canceling statement due to statement timeout'],
errors: ['You are over platform limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'canceling statement due to statement timeout'
message: 'You are over platform limits. Please contact us to know more details'
}]
});
@@ -129,11 +129,11 @@ describe('user database timeout limit', function () {
this.testClient.getLayergroup(expectedResponse, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
errors: [ 'TorqueRenderer: canceling statement due to statement timeout' ],
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'TorqueRenderer: canceling statement due to statement timeout',
message: 'You are over platform limits. Please contact us to know more details',
layer: { id: 'torque-layer0', index: 0, type: 'torque' }
}]
});
@@ -198,11 +198,11 @@ describe('user database timeout limit', function () {
assert.ifError(err);
assert.deepEqual(attributes, {
errors: [ 'TorqueRenderer: canceling statement due to statement timeout' ],
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'TorqueRenderer: canceling statement due to statement timeout',
message: 'You are over platform limits. Please contact us to know more details',
}]
});
@@ -245,11 +245,11 @@ describe('user database timeout limit', function () {
this.testClient.getLayergroup(expectedResponse, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
errors: [ 'canceling statement due to statement timeout' ],
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'canceling statement due to statement timeout',
message: 'You are over platform limits. Please contact us to know more details',
layer: {
id: 'layer0',
index: 0,
@@ -322,11 +322,11 @@ describe('user database timeout limit', function () {
assert.ifError(err);
assert.deepEqual(attributes, {
errors: ['canceling statement due to statement timeout'],
errors: ['You are over platform limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'canceling statement due to statement timeout'
message: 'You are over platform limits. Please contact us to know more details'
}]
});
test/acceptance/user-render-timeout-limit.js
+8 -8
View File
@@ -95,11 +95,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(timeoutError, {
errors: ["Render timed out"],
errors: ["You are over platform limits. Please contact us to know more details"],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: "Render timed out",
message: "You are over platform limits. Please contact us to know more details",
layer: {
id: "layer0",
index: 0,
@@ -186,11 +186,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(timeoutError, {
errors: ["Render timed out"],
errors: ["You are over platform limits. Please contact us to know more details"],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: "Render timed out"
message: "You are over platform limits. Please contact us to know more details"
}]
});
@@ -231,11 +231,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(tile, {
errors: ['Render timed out'],
errors: ['You are over platform limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: 'Render timed out'
message: 'You are over platform limits. Please contact us to know more details'
}]
});
@@ -276,11 +276,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(tile, {
errors: ['Render timed out'],
errors: ['You are over platform limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: 'Render timed out'
message: 'You are over platform limits. Please contact us to know more details'
}]
});