Fix up runtime tests

red/runtime/nodes/credentials.js

@@ -18,7 +18,7 @@ var when = require("when");
 var crypto = require('crypto');
 var runtime;
 var settings;
-var log = require("../../util").log; // TODO: separate module
+var log;
 
 
 var encryptedCredentials = null;

red/runtime/nodes/flows/Flow.js

@@ -17,7 +17,7 @@
 var when = require("when");
 var clone = require("clone");
 var typeRegistry = require("../registry");
-var Log = require("../../../util").log; // TODO: separate module
+var Log;
 var redUtil = require("../../util");
 var flowUtil = require("./util");
 
@@ -495,8 +495,9 @@ function createSubflow(sf,sfn,subflows,globalSubflows,activeNodes) {
 
 
 module.exports = {
-    init: function(settings) {
-        nodeCloseTimeout = settings.nodeCloseTimeout || 15000;
+    init: function(runtime) {
+        nodeCloseTimeout = runtime.settings.nodeCloseTimeout || 15000;
+        Log = runtime.log;
     },
     create: function(global,conf) {
         return new Flow(global,conf);

red/runtime/nodes/flows/index.js

@@ -24,7 +24,7 @@ var context = require("../context")
 var credentials = require("../credentials");
 
 var flowUtil = require("./util");
-var log = require("../../../util").log; // TODO: separate module
+var log;
 var events = require("../../events");
 var redUtil = require("../../util");
 var deprecated = require("../registry/deprecated");
@@ -50,6 +50,7 @@ function init(runtime) {
     }
     settings = runtime.settings;
     storage = runtime.storage;
+    log = runtime.log;
     started = false;
     if (!typeEventRegistered) {
         events.on('type-registered',function(type) {
@@ -67,7 +68,7 @@ function init(runtime) {
         });
         typeEventRegistered = true;
     }
-    Flow.init(settings);
+    Flow.init(runtime);
 }
 
 function loadFlows() {

red/runtime/nodes/index.js

@@ -25,7 +25,7 @@ var flows = require("./flows");
 var flowUtil = require("./flows/util")
 var context = require("./context");
 var Node = require("./Node");
-var log = require("../../util").log; // TODO: separate module
+var log;
 var library = require("./library");
 
 var events = require("../events");
@@ -94,6 +94,7 @@ function createNode(node,def) {
 
 function init(runtime) {
     settings = runtime.settings;
+    log = runtime.log;
     credentials.init(runtime);
     flows.init(runtime);
     registry.init(runtime);

red/runtime/nodes/registry/index.js

@@ -27,7 +27,7 @@ var settings;
 
 function init(runtime) {
     settings = runtime.settings;
-    installer.init(runtime.settings);
+    installer.init(runtime);
     loader.init(runtime);
     registry.init(settings,loader);
 }

red/runtime/nodes/registry/installer.js

@@ -20,7 +20,7 @@ var path = require("path");
 var fs = require("fs");
 
 var registry = require("./registry");
-var log = require("../../../util").log; // TODO: separate module
+var log;
 
 var events = require("../../events");
 
@@ -32,8 +32,9 @@ var settings;
 var moduleRe = /^(@[^/]+?[/])?[^/]+?$/;
 var slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
 
-function init(_settings) {
-    settings = _settings;
+function init(runtime) {
+    settings = runtime.settings;
+    log = runtime.log;
 }
 
 function checkModulePath(folder) {

red/runtime/nodes/registry/localfilesystem.js

@@ -19,8 +19,8 @@ var fs = require("fs");
 var path = require("path");
 
 var events;
-var log = require("../../../util").log; // TODO: separate module
-var i18n = require("../../../util").i18n; // TODO: separate module
+var log;
+var i18n;
 
 var settings;
 var disableNodePathScan = false;
@@ -29,6 +29,8 @@ var iconFileExtensions = [".png", ".gif"];
 function init(runtime) {
     settings = runtime.settings;
     events = runtime.events;
+    log = runtime.log;
+    i18n = runtime.i18n;
 }
 
 function isIncluded(name) {