@@ -4,7 +4,6 @@ var Runner = require('integra').Runner
4
4
, Cover = require ( 'integra' ) . Cover
5
5
, RCover = require ( 'integra' ) . RCover
6
6
, f = require ( 'util' ) . format
7
- , m = require ( 'mongodb-version-manager' )
8
7
, path = require ( 'path' )
9
8
, NodeVersionFilter = require ( './filters/node_version_filter' )
10
9
, MongoDBVersionFilter = require ( './filters/mongodb_version_filter' )
@@ -101,6 +100,7 @@ var Configuration = function(options) {
101
100
manager . discover ( ) . then ( function ( result ) {
102
101
// Create string representation
103
102
var currentVersion = result . version . join ( '.' ) ;
103
+ console . log ( "==== Running against MongodDB " + currentVersion ) ;
104
104
// If we have a ReplSetManager and the version is >= 3.4.0
105
105
if ( semver . satisfies ( currentVersion , ">=3.4.0" ) ) {
106
106
if ( manager instanceof ReplSetManager ) {
@@ -141,28 +141,19 @@ var Configuration = function(options) {
141
141
} ,
142
142
143
143
stop : function ( callback ) {
144
- // console.log("=================== STOP 0")
145
144
if ( skipTermination ) return callback ( ) ;
146
- // console.log("=================== STOP 1")
147
145
// Stop the servers
148
146
manager . stop ( 9 ) . then ( function ( ) {
149
- // console.log("=================== STOP 1")
150
147
callback ( ) ;
151
148
} ) ;
152
149
} ,
153
150
154
151
restart : function ( options , callback ) {
155
- // console.log("------------ restart 0")
156
- // console.log("=================== RESTART 0")
157
152
if ( typeof options == 'function' ) callback = options , options = { purge :true , kill :true } ;
158
- // console.log("=================== RESTART 1")
159
153
if ( skipTermination ) return callback ( ) ;
160
- // console.log("=================== RESTART 2")
161
- // console.log("------------ restart 1")
162
154
163
155
// Stop the servers
164
156
manager . restart ( ) . then ( function ( ) {
165
- // console.log("=================== RESTART 3")
166
157
callback ( ) ;
167
158
} ) ;
168
159
} ,
@@ -255,8 +246,8 @@ var Configuration = function(options) {
255
246
256
247
// Set up the runner
257
248
var runner = new Runner ( {
258
- // logLevel:'error'
259
- logLevel :'info'
249
+ logLevel :'error'
250
+ // logLevel:'info'
260
251
, runners : 1
261
252
, failFast : true
262
253
} ) ;
@@ -468,15 +459,14 @@ if(argv.t == 'functional') {
468
459
return runner . run ( Configuration ( _config ) ) ;
469
460
}
470
461
471
- // console.log("!!!!!!!!!!! RUN 0")
462
+ // Get the mongodb-version-manager
463
+ var m = require ( 'mongodb-version-manager' ) ;
472
464
// Kill any running MongoDB processes and
473
465
// `install $MONGODB_VERSION` || `use existing installation` || `install stable`
474
466
m ( function ( err ) {
475
- // console.log("!!!!!!!!!!! RUN 1")
476
467
if ( err ) return console . error ( err ) && process . exit ( 1 ) ;
477
468
478
469
m . current ( function ( err , version ) {
479
- // console.log("!!!!!!!!!!! RUN 2")
480
470
if ( err ) return console . error ( err ) && process . exit ( 1 ) ;
481
471
console . log ( 'Running tests against MongoDB version `%s`' , version ) ;
482
472
// Run the configuration
@@ -488,7 +478,6 @@ if(argv.t == 'functional') {
488
478
//
489
479
// Replicaset configuration
490
480
if ( argv . e == 'replicaset' ) {
491
- // console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
492
481
// Establish the server version
493
482
new ServerManager ( 'mongod' ) . discover ( ) . then ( function ( r ) {
494
483
// The individual nodes
0 commit comments