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

MVT PostGIS limit test fixed

Browse Source
This commit is contained in:
David M 2017-10-09 14:46:01 +02:00
parent 10f9f61e1e
commit 28501f6b9d
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/acceptance/user-render-timeout-limit.js
View File

@ -2,6 +2,7 @@ require('../support/test_helper');
const assert = require('../support/assert'); const assert = require('../support/assert');
const TestClient = require('../support/test-client'); const TestClient = require('../support/test-client');
var serverOptions = require('../../lib/cartodb/server_options');
const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`; const timeoutErrorTilePath = `${process.cwd()}/assets/render-timeout-fallback.png`;
@ -200,15 +201,21 @@ describe('user render timeout limit', function () {
}); });
}); });
describe('vector', function () { describe('vector (PostGIS)', vector(true));
describe('vector (mapnik)', vector(false));
function vector(usePostGIS) {
const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS;
return function () {
beforeEach(function (done) { beforeEach(function (done) {
serverOptions.renderer.mvt.usePostGIS = usePostGIS;
const mapconfig = createMapConfig(); const mapconfig = createMapConfig();
this.testClient = new TestClient(mapconfig, 1234); this.testClient = new TestClient(mapconfig, 1234);
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done); this.testClient.setUserDatabaseTimeoutLimit(50, done);
}); });
afterEach(function (done) { afterEach(function (done) {
this.testClient.setUserRenderTimeoutLimit('localhost', 0, (err) => { serverOptions.renderer.mvt.usePostGIS = originalUsePostGIS;
this.testClient.setUserDatabaseTimeoutLimit(0, (err) => {
if (err) { if (err) {
return done(err); return done(err);
} }
@ -234,7 +241,7 @@ describe('user render timeout limit', function () {
errors: ['You are over platform\'s limits. Please contact us to know more details'], errors: ['You are over platform\'s limits. Please contact us to know more details'],
errors_with_context: [{ errors_with_context: [{
type: 'limit', type: 'limit',
subtype: 'render', subtype: 'datasource',
message: 'You are over platform\'s limits. Please contact us to know more details' message: 'You are over platform\'s limits. Please contact us to know more details'
}] }]
}); });
@ -242,7 +249,8 @@ describe('user render timeout limit', function () {
done(); done();
}); });
}); });
}); };
}
describe('interativity', function () { describe('interativity', function () {
beforeEach(function (done) { beforeEach(function (done) {