redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

fix merge, run linting as part of the test suite

Browse Source
This commit is contained in:
Benjamin Coe
2015-09-12 18:44:01 -07:00
parent 77e8552374
commit 0b46a69c7e
6 changed files with 7 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/lib/redis-process.js
View File

@@ -11,6 +11,8 @@ var tcpPortUsed = require('tcp-port-used');
// wait for redis to be listening in
// all three modes (ipv4, ipv6, socket).
function waitForRedis (available, cb) {
if (process.platform === 'win32') return cb();
var ipV4 = false;
var id = setInterval(function () {
tcpPortUsed.check(config.PORT, '127.0.0.1')
@@ -38,7 +40,7 @@ module.exports = {
// the user running the test some directions.
rp.once("exit", function (code) {
if (code !== 0) spawnFailed = true;
})
});
// wait for redis to become available, by
// checking the port we bind on.
@@ -66,26 +68,3 @@ module.exports = {
});
}
};
// wait for redis to be listening in
// all three modes (ipv4, ipv6, socket).
function waitForRedis (available, cb) {
if (process.platform === 'win32') return cb();
var ipV4 = false;
var id = setInterval(function () {
tcpPortUsed.check(config.PORT, '127.0.0.1')
.then(function (_ipV4) {
ipV4 = _ipV4;
return tcpPortUsed.check(config.PORT, '::1');
})
.then(function (ipV6) {
if (ipV6 === available && ipV4 === available &&
fs.existsSync('/tmp/redis.sock') === available) {
clearInterval(id);
return cb();
}
});
}, 100);
}
>>>>>>> down to one failing test on Windows, time to rebase