[fix test] Remove leftover console.log()
from #79.
This commit is contained in:
parent
c6d8f5d140
commit
0b8aa903c7
1 changed files with 7 additions and 9 deletions
|
@ -4,7 +4,7 @@
|
||||||
* (C) 2011, Nodejitsu Inc.
|
* (C) 2011, Nodejitsu Inc.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var assert = require('assert'),
|
var assert = require('assert'),
|
||||||
spawn = require('child_process').spawn,
|
spawn = require('child_process').spawn,
|
||||||
util = require('util'),
|
util = require('util'),
|
||||||
|
@ -13,12 +13,10 @@ var assert = require('assert'),
|
||||||
nconf = require('../lib/nconf');
|
nconf = require('../lib/nconf');
|
||||||
|
|
||||||
exports.assertMerged = function (err, merged) {
|
exports.assertMerged = function (err, merged) {
|
||||||
console.log(merged);
|
merged = merged instanceof nconf.Provider
|
||||||
|
|
||||||
merged = merged instanceof nconf.Provider
|
|
||||||
? merged.store.store
|
? merged.store.store
|
||||||
: merged;
|
: merged;
|
||||||
|
|
||||||
assert.isNull(err);
|
assert.isNull(err);
|
||||||
assert.isObject(merged);
|
assert.isObject(merged);
|
||||||
assert.isTrue(merged.apples);
|
assert.isTrue(merged.apples);
|
||||||
|
@ -36,18 +34,18 @@ exports.assertSystemConf = function (options) {
|
||||||
return {
|
return {
|
||||||
topic: function () {
|
topic: function () {
|
||||||
var env = null;
|
var env = null;
|
||||||
|
|
||||||
if (options.env) {
|
if (options.env) {
|
||||||
env = {}
|
env = {}
|
||||||
Object.keys(process.env).forEach(function (key) {
|
Object.keys(process.env).forEach(function (key) {
|
||||||
env[key] = process.env[key];
|
env[key] = process.env[key];
|
||||||
});
|
});
|
||||||
|
|
||||||
Object.keys(options.env).forEach(function (key) {
|
Object.keys(options.env).forEach(function (key) {
|
||||||
env[key] = options.env[key];
|
env[key] = options.env[key];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
var child = spawn('node', [options.script].concat(options.argv), { env: env });
|
var child = spawn('node', [options.script].concat(options.argv), { env: env });
|
||||||
child.stdout.once('data', this.callback.bind(this, null));
|
child.stdout.once('data', this.callback.bind(this, null));
|
||||||
},
|
},
|
||||||
|
@ -67,4 +65,4 @@ exports.cp = function (from, to, callback) {
|
||||||
|
|
||||||
exports.fixture = function (file) {
|
exports.fixture = function (file) {
|
||||||
return path.join(__dirname, 'fixtures', file);
|
return path.join(__dirname, 'fixtures', file);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue