From f45886cc6de27f1d3ab409eac2ccc310ef57d03c Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Sat, 15 Sep 2012 14:56:15 -0700 Subject: [PATCH] Cosmetic (tabbing). --- test/server.js | 1 + test/standalone-test.js | 11 ++-- test/utils.js | 123 ++++++++++++++++++++-------------------- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/test/server.js b/test/server.js index c0e735b8af..3c7b54d398 100644 --- a/test/server.js +++ b/test/server.js @@ -33,3 +33,4 @@ var start = function(name, done) { exports.start = start; console.log("server.js<"); +// vim:ts=4 diff --git a/test/standalone-test.js b/test/standalone-test.js index 3f6c1c8d58..81221d7d19 100644 --- a/test/standalone-test.js +++ b/test/standalone-test.js @@ -7,11 +7,12 @@ var server = require("./server.js"); buster.testCase("Check standalone server startup", { "Start": function (done) { - server.start("alpha", function(e) { - buster.refute(e); - done(); - }); - } + server.start("alpha", function(e) { + buster.refute(e); + done(); + }); + } }); // console.log("standalone-test.js<"); +// vim:ts=4 diff --git a/test/utils.js b/test/utils.js index c755f02b38..c840431213 100644 --- a/test/utils.js +++ b/test/utils.js @@ -4,34 +4,34 @@ var path = require("path"); var filterErr = function(code, done) { return function (e) { - done(e.code !== code ? e : undefined); - } + done(e.code !== code ? e : undefined); + }; }; var throwErr = function(done) { return function (e) { - if (e) - throw e; - - done(); - }; + if (e) + throw e; + + done(); + }; }; // apply function to elements of array. Return first true value to done or undefined. var mapOr = function(func, array, done) { if (array.length) { - func(array[array.length-1], function (v) { - if (v) { - done(v); - } - else { - array.length -= 1; - mapOr(func, array, done); - } - }); + func(array[array.length-1], function (v) { + if (v) { + done(v); + } + else { + array.length -= 1; + mapOr(func, array, done); + } + }); } else { - done(); + done(); } }; @@ -39,23 +39,23 @@ var mapOr = function(func, array, done) { var mkPath = function(dirPath, mode, done) { fs.mkdir(dirPath, mode, function (e) { if (e && e.code === "EEXIST") { - // Already exists, done. - done(); + // Already exists, done. + done(); } else if (e.code === "ENOENT") { - // Missing sub dir. + // Missing sub dir. - mkPath(path.dirname(dirPath), mode, function(e) { - if (e) { - throw e; - } - else { - mkPath(dirPath, mode, done); - } - }); + mkPath(path.dirname(dirPath), mode, function(e) { + if (e) { + throw e; + } + else { + mkPath(dirPath, mode, done); + } + }); } else { - throw e; + throw e; } }); }; @@ -74,50 +74,50 @@ 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") { - done(); - } - if (err) { - done(err); - } - else if (stats.isDirectory()) { - emptyPath(dirPath, function (e) { - if (e) { - done(e); - } - else { -// console.log("rmdir: %s", dirPath); done(); - fs.rmdir(dirPath, done); - } + if (err && err.code == "ENOENT") { + done(); + } + if (err) { + done(err); + } + else if (stats.isDirectory()) { + emptyPath(dirPath, function (e) { + if (e) { + done(e); + } + else { +// console.log("rmdir: %s", dirPath); done(); + fs.rmdir(dirPath, done); + } + }); + } + else { +// console.log("unlink: %s", dirPath); done(); + fs.unlink(dirPath, done); + } }); - } - else { -// console.log("unlink: %s", dirPath); done(); - fs.unlink(dirPath, done); - } - }); }; // Create directory if needed and empty if needed. var resetPath = function(dirPath, mode, done) { mkPath(dirPath, mode, function (e) { - if (e) { - done(e); - } - else { - emptyPath(dirPath, done); - } - }); + if (e) { + done(e); + } + else { + emptyPath(dirPath, done); + } + }); }; var trace = function(comment, func) { return function() { - console.log("%s: %s", trace, arguments.toString); - func(arguments); - }; + console.log("%s: %s", trace, arguments.toString); + func(arguments); + }; }; exports.emptyPath = emptyPath; @@ -127,3 +127,4 @@ exports.resetPath = resetPath; exports.rmPath = rmPath; exports.trace = trace; +// vim:ts=4