From d1361c900c7cc47f555a23909cece5ce12d248ab Mon Sep 17 00:00:00 2001
From: Dominic Bosch <dominic.bosch.db@gmail.com>
Date: Wed, 2 Apr 2014 19:22:07 +0200
Subject: [PATCH] HOTFIX! Finally found the silly bug in DB shutDown approach
 at the end of the testing!!! Lets grab a beer!

---
 testing/end-unittest/end-test.coffee   | 13 -------------
 testing/test_components-manager.coffee |  4 ++--
 unit_tests.sh                          | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 testing/end-unittest/end-test.coffee

diff --git a/testing/end-unittest/end-test.coffee b/testing/end-unittest/end-test.coffee
deleted file mode 100644
index 89c9fac..0000000
--- a/testing/end-unittest/end-test.coffee
+++ /dev/null
@@ -1,13 +0,0 @@
-path = require 'path'
-logger = require path.join '..', '..', 'js-coffee', 'logging'
-log = logger.getLogger
-  nolog: true
-db = require path.join '..', '..', 'js-coffee', 'persistence'
-opts =
-  logger: log
-opts[ 'db-port' ] = 6379
-db opts
-
-# This needs to be done because else the DB connection will remain alive and
-# prevent the unit test from ending
-setTimeout db.shutDown, 2000
\ No newline at end of file
diff --git a/testing/test_components-manager.coffee b/testing/test_components-manager.coffee
index c366e4f..c519248 100644
--- a/testing/test_components-manager.coffee
+++ b/testing/test_components-manager.coffee
@@ -10,8 +10,8 @@ catch err
   console.log 'Error fetching standard objects file: ' + err.message
 
 logger = require path.join '..', 'js-coffee', 'logging'
-log = logger.getLogger()
-  # nolog: true
+log = logger.getLogger
+  nolog: true
 
 cm = require path.join '..', 'js-coffee', 'components-manager'
 opts =
diff --git a/unit_tests.sh b/unit_tests.sh
index ac9de2d..64ac42c 100755
--- a/unit_tests.sh
+++ b/unit_tests.sh
@@ -1,16 +1,22 @@
 #!/usr/bin/env node
 process.chdir( __dirname );
-var fs = require( 'fs' );
-var path = require( 'path' );
-var nodeunit = require( 'nodeunit' );
-var args = process.argv.slice( 2 );
+var fs = require( 'fs' ),
+  path = require( 'path' ),
+  nodeunit = require( 'nodeunit' ),
+  db = require( './js-coffee/persistence' ),
+  args = process.argv.slice( 2 ),
+  fEnd = function() {
+    console.log('Shutting down DB from unit_test.sh script...');
+    db.shutDown();
+  };
+   
 if( args[ 0 ] !== undefined ) {
   var fl = path.resolve( args[ 0 ] );
   if ( fs.existsSync( fl ) ) {
-    nodeunit.reporters.default.run( [ fl, 'testing/end-unittest' ] );
+    nodeunit.reporters.default.run( [ fl ], null, fEnd );
   } else {
     console.error( 'File not found!!' );
   }
 } else {
-  nodeunit.reporters.default.run( [ 'testing', 'testing/end-unittest' ] );  
+  nodeunit.reporters.default.run( [ 'testing' ], null, fEnd );
 }