Browse Source

bla

fix-windows-spawn
Ruben Bridgewater 9 years ago
parent
commit
218c0b35d7
  1. 3
      test/conf/password.win32.conf
  2. 2
      test/conf/redis.win32.conf
  3. 5
      test/conf/rename.win32.conf
  4. 4
      test/conf/slave.win32.conf
  5. 46
      test/lib/redis-process.js

3
test/conf/password.win32.conf

@ -0,0 +1,3 @@
requirepass porkchopsandwiches
port 6379
bind ::1 127.0.0.1

2
test/conf/redis.win32.conf

@ -0,0 +1,2 @@
port 6379
bind ::1 127.0.0.1

5
test/conf/rename.win32.conf

@ -0,0 +1,5 @@
port 6379
bind ::1 127.0.0.1
rename-command SET 807081f5afa96845a02816a28b7258c3
rename-command GET f397808a43ceca3963e22b4e13deb672
rename-command GETRANGE 9e3102b15cf231c4e9e940f284744fe0

4
test/conf/slave.win32.conf

@ -0,0 +1,4 @@
port 6381
bind ::1 127.0.0.1
slaveof localhost 6379
masterauth porkchopsandwiches

46
test/lib/redis-process.js

@ -49,31 +49,29 @@ module.exports = {
start: function (done, conf, port) {
// spawn redis with our testing configuration.
var confFile = conf || path.resolve(__dirname, '../conf/redis.conf');
var redis = process.platform === 'win32' ? 'redis-64\\tools\\redis-server.exe' : 'redis-server';
var redis = 'redis-server';
if (process.platform === 'win32') {
confFile = confFile.replace('.conf', '.win32.conf');
redis = 'redis-64\\tools\\redis-server.exe';
}
var rp = spawn.sync(redis, [confFile], { stdio: 'inherit' });
// wait for redis to become available, by
// checking the port we bind on.
waitForRedis(true, function () {
// return an object that can be used in
// an after() block to shutdown redis.
return done(null, {
spawnFailed: function () {
return false;
},
stop: function (done) {
rp.once('exit', function (code) {
var error = null;
if (code !== null && code !== 0) {
error = new Error('Redis shutdown failed with code ' + code);
}
waitForRedis(false, function () {
return done(error);
}, port);
});
rp.kill('SIGTERM');
}
});
}, port);
done(null, {
spawnFailed: function () {
return false; // Remove if as soon as it's not necessary anymore
},
stop: function (done) {
rp.once('exit', function (code) {
var error = null;
if (code !== null && code !== 0) {
error = new Error('Redis shutdown failed with code ' + code);
}
waitForRedis(false, function () {
return done(error);
}, port);
});
rp.kill('SIGTERM');
}
});
}
};

Loading…
Cancel
Save