diff options
author | Bert Belder <bertbelder@gmail.com> | 2012-06-12 19:52:38 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2012-06-12 19:52:38 +0200 |
commit | cbeeea62cf10bbf71636fe03282590050beb1d36 (patch) | |
tree | bf8334f327c4fa3d0377537c294448de55094331 /test/pummel | |
parent | b615077bab71db73cf065d6162cae8d6cb84d8d2 (diff) | |
download | node-new-cbeeea62cf10bbf71636fe03282590050beb1d36.tar.gz |
Revert "uv: upgrade to b7e150ee"
Upgrade wasn't done correctly.
This reverts commit b615077bab71db73cf065d6162cae8d6cb84d8d2.
Diffstat (limited to 'test/pummel')
-rw-r--r-- | test/pummel/test-exec.js | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/test/pummel/test-exec.js b/test/pummel/test-exec.js index 3b16d020a5..70771ab4e1 100644 --- a/test/pummel/test-exec.js +++ b/test/pummel/test-exec.js @@ -22,20 +22,10 @@ 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(process.execPath + ' -p -e process.versions', - function(err, stdout, stderr) { +exec('ls /', function(err, stdout, stderr) { if (err) { error_count++; console.log('error!: ' + err.code); @@ -49,7 +39,7 @@ exec(process.execPath + ' -p -e process.versions', }); -exec('thisisnotavalidcommand', function(err, stdout, stderr) { +exec('ls /DOES_NOT_EXIST', function(err, stdout, stderr) { if (err) { error_count++; assert.equal('', stdout); @@ -69,7 +59,7 @@ exec('thisisnotavalidcommand', function(err, stdout, stderr) { var sleeperStart = new Date(); -exec(SLEEP, { timeout: 50 }, function(err, stdout, stderr) { +exec('sleep 3', { 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); @@ -108,13 +98,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); |