Merge branch 'ut'

This commit is contained in:
Arthur Britto
2012-09-17 15:46:12 -07:00
6 changed files with 91 additions and 50 deletions

View File

@@ -5,31 +5,8 @@
# or Mac style end of lines. Blank lines and lines beginning with '#' are
# ignored. Undefined sections are reserved. No escapes are currently defined.
#
# When you launch newcoind, it will attempt to find this file.
#
# --conf=<path>:
# You may specify the location of this file with --conf=<path>. The config
# directory is the directory containing this file. The data directory is a
# the subdirectory named "dbs".
#
# Windows and no --conf:
# The config directory is the same directory as the newcoind program. The
# data directory is a the subdirectory named "dbs".
#
# Other OSes and no --conf:
# This file will be looked for in these places in the following order:
# ./newcoind.cfg
# $XDG_CONFIG_HOME/newcoin/newcoind.cfg
#
# If newcoind.cfg, is found in the current working directory, the directory
# will be used as the config directory. The data directory is a the
# subdirectory named "dbs".
#
# Otherwise, the data directory data is:
# $XDG_DATA_HOME/newcoin/
#
# Note: $XDG_CONFIG_HOME defaults to $HOME/.config
# $XDG_DATA_HOME defaults to $HOME/.local/share
# When you launch newcoind, it will attempt to find this file. For details,
# refer to the manual page for --conf command line option.
#
# [debug_logfile]
# Specifies were a debug logfile is kept. By default, no debug log is kept

View File

@@ -96,7 +96,7 @@ int main(int argc, char* argv[])
("standalone,a", "Run with no peers.")
("test,t", "Perform unit tests.")
("parameters", po::value< vector<string> >(), "Specify comma separated parameters.")
("verbose,v", "Increase log level")
("verbose,v", "Increase log level.")
;
// Interpret positional arguments as --parameters.

View File

@@ -2,12 +2,20 @@
// Configuration for unit tests
//
var path = require("path");
// Where to find the binary.
exports.newcoind = path.join(process.cwd(), "newcoind");
// Configuration for servers.
exports.servers = {
alpha : {
"peer_ip" : "0.0.0.0",
"peer_port" : 51235,
// "peer_ip" : "0.0.0.0",
// "peer_port" : 51235,
"rpc_ip" : "0.0.0.0",
"rpc_port" : 5005,
"websocket_ip" : "127.0.0.1",
"websocket_port" : 5005,
"websocket_port" : 6005,
"validation_seed" : "shhDFVsmS2GSu5vUyZSPXYfj1r79h",
"validators" : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta"
}

View File

@@ -5,22 +5,22 @@
// Servers are created in tmp/server/$server
//
console.log("server.js>");
var config = require("./config.js");
var utils = require("./utils.js");
var fs = require("fs");
var path = require("path");
var util = require("util");
// var child = require("child");
var child = require("child_process");
var servers = {};
var serverPath = function(name) {
return "tmp/server/" + name;
};
// Return a server's newcoind.cfg as string.
var serverConfig = function(name) {
var configContent = function(name) {
var cfg = config.servers[name];
return Object.keys(cfg).map(function (o) {
@@ -28,18 +28,47 @@ var serverConfig = function(name) {
}).join("");
};
var configPath = function(name) {
return path.join(serverPath(name), "newcoind.cfg");
};
// Write a server's newcoind.cfg.
var writeConfig = function(name, done) {
fs.writeFile(path.join(serverPath(name), "newcoind.cfg"), serverConfig(name), 'utf8', done);
fs.writeFile(configPath(name), configContent(name), 'utf8', done);
};
var serverSpawnSync = function(name) {
// Spawn in standalone mode for now.
var server = child.spawn(
config.newcoind,
[
"-a",
"--conf=newcoind.cfg"
],
{
cwd: serverPath(name),
env: process.env,
stdio: 'inherit'
});
servers[name] = server;
console.log("server: %s: %s -a --conf=%s", server.pid, config.newcoind, configPath(name));
console.log("sever: start: servers = %s", Object.keys(servers).toString());
server.on('exit', function (code, signal) {
// If could not exec: code=127, signal=null
// If regular exit: code=0, signal=null
console.log("sever: spawn: server exited code=%s: signal=%s", code, signal);
delete servers[name];
});
};
var makeBase = function(name, done) {
var path = serverPath(name);
console.log("start> %s: %s", name, path);
// Reset the server directory, build it if needed.
utils.resetPath(path, parseInt('0777', 8), function (e) {
utils.resetPath(path, '0777', function (e) {
if (e) {
throw e;
}
@@ -47,15 +76,38 @@ var makeBase = function(name, done) {
writeConfig(name, done);
}
});
console.log("start< %s", name);
};
var start = function(name, done) {
makeBase(name, done);
// Prepare the working directory and spawn the server.
exports.start = function(name, done) {
makeBase(name, function (e) {
if (e) {
throw e;
}
else {
serverSpawnSync(name);
done();
}
});
};
exports.start = start;
exports.stop = function(name, done) {
console.log("sever: stop: servers = %s", Object.keys(servers).toString());
var server = servers[name];
if (server) {
server.on('exit', function (code, signal) {
console.log("sever: stop: server exited");
delete servers[name];
done();
});
server.kill();
}
else
{
console.log("sever: stop: no such server");
done();
}
};
console.log("server.js<");
// vim:ts=4

View File

@@ -6,10 +6,14 @@ var buster = require("buster");
var server = require("./server.js");
buster.testCase("Check standalone server startup", {
"Start": function (done) {
server.start("alpha", function(e) {
"server start and stop": function (done) {
server.start("alpha",
function (e) {
buster.refute(e);
done();
server.stop("alpha", function (e) {
buster.refute(e);
done();
});
});
}
});

View File

@@ -37,9 +37,9 @@ var mapOr = function(func, array, done) {
// Make a directory and sub-directories.
var mkPath = function(dirPath, mode, done) {
fs.mkdir(dirPath, mode, function (e) {
if (e && e.code === "EEXIST") {
// Already exists, done.
fs.mkdir(dirPath, typeof mode === "string" ? parseInt(mode, 8) : mode, function (e) {
if (!e || e.code === "EEXIST") {
// Created or already exists, done.
done();
}
else if (e.code === "ENOENT") {
@@ -74,7 +74,7 @@ var emptyPath = function(dirPath, done) {
// Remove path recursively.
var rmPath = function(dirPath, done) {
console.log("rmPath: %s", dirPath);
// console.log("rmPath: %s", dirPath);
fs.lstat(dirPath, function (err, stats) {
if (err && err.code == "ENOENT") {