changes in tests to work in docker-dev-env

test/acceptance/multilayer-test.js

@@ -512,7 +512,7 @@ var QueryTables = require('cartodb-query-tables').queryTables;
                 ]
             };
             var statskey = 'user:localhost:mapviews';
-            var redisStatsClient = redis.createClient(global.environment.redis.port);
+            var redisStatsClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
             var expectedToken; // will be set on first post and checked on second
             var now = strftime('%Y%m%d', new Date());
             step(

test/acceptance/rate-limit-test.js

@@ -164,7 +164,7 @@ describe('rate limit', function () {
         global.environment.enabledFeatures.rateLimitsEnabled = true;
         global.environment.enabledFeatures.rateLimitsByEndpoint.anonymous = true;
 
-        redisClient = redis.createClient(global.environment.redis.port);
+        redisClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
         testClient = new TestClient(createMapConfig(), 1234);
     });
 
@@ -226,7 +226,7 @@ describe('rate limit middleware', function () {
         });
         rateLimit = rateLimitMiddleware(userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ANONYMOUS);
 
-        redisClient = redis.createClient(global.environment.redis.port);
+        redisClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
         testClient = new TestClient(createMapConfig(), 1234);
 
         const count = 1;
@@ -290,7 +290,7 @@ function rateLimitAndVectorTilesTest (usePostGIS) {
         global.environment.enabledFeatures.rateLimitsEnabled = true;
         global.environment.enabledFeatures.rateLimitsByEndpoint.tile = true;
 
-        redisClient = redis.createClient(global.environment.redis.port);
+        redisClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
         const count = 1;
         const period = 1;
         const burst = 0;

test/acceptance/templates-test.js

@@ -1506,7 +1506,7 @@ describe('template_api', function () {
             layergroup: layergroup
         };
         var statskey = 'user:localhost:mapviews';
-        var redisStatsClient = redis.createClient(global.environment.redis.port);
+        var redisStatsClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
         var templateId; // will be set on template post
         var now = strftime('%Y%m%d', new Date());
         var errors = [];

test/index.js

@@ -10,7 +10,9 @@ if (!process.env.NODE_ENV) {
 }
 
 const environment = require(`../config/environments/${process.env.NODE_ENV}.js`);
+const REDIS_HOST = environment.redis.host;
 const REDIS_PORT = environment.redis.port;
+const DB_HOST = environment.postgres.host;
 const REDIS_CELL_PATH = path.resolve(
     process.platform === 'darwin'
         ? './test/support/libredis_cell.dylib'
@@ -24,28 +26,34 @@ const PUBLIC_USER = environment.postgres.user;
 const PUBLIC_USER_PASSWORD = environment.postgres.password;
 const TEST_DB = `${TEST_USER}_db`;
 
+const REDIS_SERVER_IS_LOCAL = (['127.0.0.1', 'localhost'].includes(REDIS_HOST));
+
 async function startRedis () {
-    await exec(`redis-server --port ${REDIS_PORT} --loadmodule ${REDIS_CELL_PATH} --logfile ${__dirname}/redis-server.log --daemonize yes`);
+    if (REDIS_SERVER_IS_LOCAL) {
+        await exec(`redis-server --port ${REDIS_PORT} --loadmodule ${REDIS_CELL_PATH} --logfile ${__dirname}/redis-server.log --daemonize yes`);
+    }
 }
 
 async function stopRedis () {
-    await exec(`redis-cli -p ${REDIS_PORT} shutdown`);
+    if (REDIS_SERVER_IS_LOCAL) {
+        await exec(`redis-cli -p ${REDIS_PORT} shutdown`);
+    }
 }
 
 async function dropDatabase () {
-    await exec(`dropdb --if-exists ${TEST_DB}`, {
+    await exec(`dropdb -h ${DB_HOST} --if-exists ${TEST_DB}`, {
         env: Object.assign({ PGUSER: 'postgres' }, process.env)
     });
 }
 
 async function createDatabase () {
-    await exec(`createdb -T template_postgis -EUTF8 "${TEST_DB}"`, {
+    await exec(`createdb -h ${DB_HOST} -T template_postgis -EUTF8 "${TEST_DB}"`, {
         env: Object.assign({ PGUSER: 'postgres' }, process.env)
     });
 }
 
 async function createDatabaseExtension () {
-    await exec(`psql -c "CREATE EXTENSION IF NOT EXISTS cartodb CASCADE;" ${TEST_DB}`, {
+    await exec(`psql -h ${DB_HOST} -c "CREATE EXTENSION IF NOT EXISTS cartodb CASCADE;" ${TEST_DB}`, {
         env: Object.assign({ PGUSER: 'postgres' }, process.env)
     });
 }
@@ -67,7 +75,7 @@ async function populateDatabase () {
         sed -e "s/:PUBLICPASS/${PUBLIC_USER_PASSWORD}/g" |
         sed -e "s/:TESTUSER/${TEST_USER}/g" |
         sed -e "s/:TESTPASS/${TEST_PASSWORD}/g" |
-        PGOPTIONS='--client-min-messages=WARNING' psql -q -v ON_ERROR_STOP=1 ${TEST_DB}
+        PGOPTIONS='--client-min-messages=WARNING' psql -h ${DB_HOST} -q -v ON_ERROR_STOP=1 ${TEST_DB}
     `;
 
     await exec(populateDatabaseCmd, {
@@ -82,13 +90,13 @@ async function populateRedis () {
         HMSET rails:users:localhost \
             id ${TEST_USER_ID} \
             database_name "${TEST_DB}" \
-            database_host localhost \
+            database_host ${DB_HOST} \
             map_key 1234
 
         HMSET rails:users:cartodb250user \
             id ${TEST_USER_ID} \
             database_name "${TEST_DB}" \
-            database_host "localhost" \
+            database_host "${DB_HOST}" \
             database_password "${TEST_PASSWORD}" \
             map_key 4321
 
@@ -141,7 +149,7 @@ async function populateRedis () {
             database_password "public"
     `;
 
-    await exec(`echo "${commands}" | redis-cli -p ${REDIS_PORT} -n 5`);
+    await exec(`echo "${commands}" | redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} -n 5`);
 }
 
 async function main (args) {

test/integration/analysis-backend-limits-test.js

@@ -16,7 +16,7 @@ describe('analysis-backend limits', function () {
     var user = 'localhost';
 
     beforeEach(function () {
-        redisClient = redis.createClient(global.environment.redis.port);
+        redisClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
         keysToDelete = {};
         var redisPool = new RedisPool(global.environment.redis);
         this.metadataBackend = cartodbRedis({ pool: redisPool });

test/integration/template-maps-limits-test.js

@@ -30,7 +30,7 @@ describe('TemplateMaps limits', function () {
         };
     }
 
-    var redisClient = redis.createClient(global.environment.redis.port);
+    var redisClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
     var redisPool = new RedisPool(global.environment.redis);
 
     afterEach(function (done) {

test/support/test-helper.js

@@ -94,7 +94,7 @@ var redisClient;
 
 beforeEach(function () {
     if (!redisClient) {
-        redisClient = redis.createClient(global.environment.redis.port);
+        redisClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
     }
 });
 
@@ -157,7 +157,7 @@ function deleteRedisKeys (keysToDelete, callback) {
     }
 
     Object.keys(keysToDelete).forEach(function (k) {
-        var redisClient = redis.createClient(global.environment.redis.port);
+        var redisClient = redis.createClient(global.environment.redis.port, global.environment.redis.host);
         redisClient.select(keysToDelete[k], function () {
             redisClient.del(k, function (err, deletedKeysCount) {
                 assert.ifError(err);