summaryrefslogtreecommitdiff
path: root/test/pummel
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2012-06-12 17:05:49 +0200
committerBert Belder <bertbelder@gmail.com>2012-06-12 17:06:54 +0200
commitb615077bab71db73cf065d6162cae8d6cb84d8d2 (patch)
tree340f343986de77b62cc9cd4d1cb7694adb9e9c38 /test/pummel
parent0385b17ce06b7c12ad3e4035477f6a0cf897580e (diff)
downloadnode-new-b615077bab71db73cf065d6162cae8d6cb84d8d2.tar.gz
uv: upgrade to b7e150ee
Diffstat (limited to 'test/pummel')
-rw-r--r--test/pummel/test-exec.js18
1 files changed, 14 insertions, 4 deletions
diff --git a/test/pummel/test-exec.js b/test/pummel/test-exec.js
index 70771ab4e1..3b16d020a5 100644
--- a/test/pummel/test-exec.js
+++ b/test/pummel/test-exec.js
@@ -22,10 +22,20 @@
var common = require('../common');
var assert = require('assert');
var exec = require('child_process').exec;
+
+
+if (process.platform !== 'win32') {
+ var SLEEP = "sleep 3";
+} else {
+ var SLEEP = "choice /t 3 /c X /d X";
+}
+
var success_count = 0;
var error_count = 0;
-exec('ls /', function(err, stdout, stderr) {
+
+exec(process.execPath + ' -p -e process.versions',
+ function(err, stdout, stderr) {
if (err) {
error_count++;
console.log('error!: ' + err.code);
@@ -39,7 +49,7 @@ exec('ls /', function(err, stdout, stderr) {
});
-exec('ls /DOES_NOT_EXIST', function(err, stdout, stderr) {
+exec('thisisnotavalidcommand', function(err, stdout, stderr) {
if (err) {
error_count++;
assert.equal('', stdout);
@@ -59,7 +69,7 @@ exec('ls /DOES_NOT_EXIST', function(err, stdout, stderr) {
var sleeperStart = new Date();
-exec('sleep 3', { timeout: 50 }, function(err, stdout, stderr) {
+exec(SLEEP, { timeout: 50 }, function(err, stdout, stderr) {
var diff = (new Date()) - sleeperStart;
console.log('\'sleep 3\' with timeout 50 took %d ms', diff);
assert.ok(diff < 500);
@@ -98,13 +108,13 @@ function killMeTwiceCallback(err, stdout, stderr) {
}
-
exec('python -c "print 200000*\'C\'"', {maxBuffer: 1000},
function(err, stdout, stderr) {
assert.ok(err);
assert.ok(/maxBuffer/.test(err.message));
});
+
process.on('exit', function() {
assert.equal(1, success_count);
assert.equal(1, error_count);