minor test fixes for generators

Author: christkv

test/functional/operation_generators_example_tests.js

@@ -46,7 +46,7 @@ exports.aggregationExample2WithGenerators = {
           ]}];
 
       // Create a collection
-      var collection = db.collection('aggregationExample2_with_generators');
+      var collection = db.collection('aggregationExample2_with_generatorsGenerator');
 
       // Insert the docs
       yield collection.insertMany(docs, {w: 1});
@@ -111,7 +111,7 @@ exports['Aggregation Cursor next Test with Generators'] = {
           ]}];
 
       // Create a collection
-      var collection = db.collection('aggregation_next_example_with_generators');
+      var collection = db.collection('aggregation_next_example_with_generatorsGenerator');
 
       // Insert the docs
       yield collection.insertMany(docs, {w: 1});
@@ -2703,41 +2703,6 @@ exports.shouldCorrectlyDefineSystemLevelFunctionAndExecuteFunctionWithGenerators
   }
 }
 
-/**
- * An example of a simple single server db connection and close function using a Generator and the co module.
- *
- * @example-class Db
- * @example-method close
- * @ignore
- */
-exports.shouldCorrectlyOpenASimpleDbSingleServerConnectionAndCloseWithCallbackWithGenerators = {
-  metadata: { requires: { generators:true, topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
-  
-  // The actual test we wish to run
-  test: function(configuration, test) {
-    var co = require('co');
-
-    co(function*() {
-      // Connect
-      var db = yield configuration.newDbInstance({w:1}, {poolSize:1}).open();
-    // LINE var MongoClient = require('mongodb').MongoClient,
-    // LINE   co = require('co');
-    // LINE   test = require('assert');
-    // LINE
-    // LINE co(function*() {
-    // LINE   var db = yield MongoClient.connect('mongodb://localhost:27017/test');
-    // REPLACE configuration.writeConcernMax() WITH {w:1}
-    // REMOVE-LINE test.done();
-    // BEGIN
-
-      // Close the connection with a callback that is optional
-      var result = yield db.close();
-      test.done();
-    });
-    // END
-  }
-}
-
 /**
  * An example of retrieving the collections list for a database using a Generator and the co module.
  *
@@ -2765,7 +2730,7 @@ exports.shouldCorrectlyRetrievelistCollectionsWithGenerators = {
     // REMOVE-LINE test.done();
     // BEGIN
       // Get an empty db
-      var db1 = db.db('listCollectionTestDb2');
+      var db1 = db.db('listCollectionTestDb2Generator');
       // Create a collection
       var collection = db1.collection('shouldCorrectlyRetrievelistCollections_with_generators');
       // Ensure the collection was created

test/runner.js

@@ -42,13 +42,13 @@ var startupOptions = {
   , skip: false
 }
 
-// // Skipping parameters
-// var startupOptions = {
-//     skipStartup: false
-//   , skipRestart: false
-//   , skipShutdown: false
-//   , skip: false
-// }
+// Skipping parameters
+var startupOptions = {
+    skipStartup: false
+  , skipRestart: false
+  , skipShutdown: false
+  , skip: false
+}
 
 /**
  * Standalone MongoDB Configuration
@@ -217,75 +217,75 @@ var runner = new Runner({
 });
 
 var testFiles =[
-  //   '/test/functional/mongo_client_tests.js'
-  // , '/test/functional/collection_tests.js'
-  // , '/test/functional/db_tests.js'
-  // , '/test/functional/cursor_tests.js'
-  // , '/test/functional/insert_tests.js'
-  // , '/test/functional/aggregation_tests.js'
-  // , '/test/functional/admin_tests.js'
-  // , '/test/functional/connection_tests.js'
-  // , '/test/functional/cursorstream_tests.js'
-  // , '/test/functional/custom_pk_tests.js'
-  // , '/test/functional/domain_tests.js'
-  // , '/test/functional/error_tests.js'
-  // , '/test/functional/find_tests.js'
-  // , '/test/functional/index_tests.js'
-  // , '/test/functional/mapreduce_tests.js'
-  // , '/test/functional/maxtimems_tests.js'
-  // , '/test/functional/multiple_db_tests.js'
-  // , '/test/functional/object_id_tests.js'
-  // , '/test/functional/raw_tests.js'
-  // , '/test/functional/readpreference_tests.js'
-  // , '/test/functional/remove_tests.js'
-  // , '/test/functional/unicode_tests.js'
-  // , '/test/functional/uri_tests.js'
-  // , '/test/functional/url_parser_tests.js'
-  // , '/test/functional/gridfs_tests.js'
-  // , '/test/functional/bulk_tests.js'
-  // , '/test/functional/operation_example_tests.js'
-  // , '/test/functional/crud_api_tests.js'
-  // , '/test/functional/reconnect_tests.js'
-
-  // // Promise tests
-  // , '/test/functional/promises_db_tests.js'
-  // , '/test/functional/promises_collection_tests.js'
-  // , '/test/functional/promises_cursor_tests.js'
-  // , '/test/functional/operation_promises_example_tests.js'
+    '/test/functional/mongo_client_tests.js'
+  , '/test/functional/collection_tests.js'
+  , '/test/functional/db_tests.js'
+  , '/test/functional/cursor_tests.js'
+  , '/test/functional/insert_tests.js'
+  , '/test/functional/aggregation_tests.js'
+  , '/test/functional/admin_tests.js'
+  , '/test/functional/connection_tests.js'
+  , '/test/functional/cursorstream_tests.js'
+  , '/test/functional/custom_pk_tests.js'
+  , '/test/functional/domain_tests.js'
+  , '/test/functional/error_tests.js'
+  , '/test/functional/find_tests.js'
+  , '/test/functional/index_tests.js'
+  , '/test/functional/mapreduce_tests.js'
+  , '/test/functional/maxtimems_tests.js'
+  , '/test/functional/multiple_db_tests.js'
+  , '/test/functional/object_id_tests.js'
+  , '/test/functional/raw_tests.js'
+  , '/test/functional/readpreference_tests.js'
+  , '/test/functional/remove_tests.js'
+  , '/test/functional/unicode_tests.js'
+  , '/test/functional/uri_tests.js'
+  , '/test/functional/url_parser_tests.js'
+  , '/test/functional/gridfs_tests.js'
+  , '/test/functional/bulk_tests.js'
+  , '/test/functional/operation_example_tests.js'
+  , '/test/functional/crud_api_tests.js'
+  , '/test/functional/reconnect_tests.js'
+
+  // Promise tests
+  , '/test/functional/promises_db_tests.js'
+  , '/test/functional/promises_collection_tests.js'
+  , '/test/functional/promises_cursor_tests.js'
+  , '/test/functional/operation_promises_example_tests.js'
 
   // Generator tests
   , '/test/functional/operation_generators_example_tests.js'
 
-  // // Logging tests
-  // , '/test/functional/logger_tests.js'
+  // Logging tests
+  , '/test/functional/logger_tests.js'
 
-  // // Replicaset tests
-  // , '/test/functional/replset_operations_tests.js'
-  // , '/test/functional/replset_read_preference_tests.js'
-  // , '/test/functional/replset_failover_tests.js'
-  // , '/test/functional/replset_connection_tests.js'
+  // Replicaset tests
+  , '/test/functional/replset_operations_tests.js'
+  , '/test/functional/replset_read_preference_tests.js'
+  , '/test/functional/replset_failover_tests.js'
+  , '/test/functional/replset_connection_tests.js'
 
-  // // Sharding tests
-  // , '/test/functional/sharding_failover_tests.js'
-  // , '/test/functional/sharding_connection_tests.js'
-  // , '/test/functional/sharding_read_preference_tests.js'
+  // Sharding tests
+  , '/test/functional/sharding_failover_tests.js'
+  , '/test/functional/sharding_connection_tests.js'
+  , '/test/functional/sharding_read_preference_tests.js'
 
-  // // SSL tests
-  // , '/test/functional/ssl_mongoclient_tests.js'
-  // , '/test/functional/ssl_validation_tests.js'
-  // , '/test/functional/ssl_x509_connect_tests.js'
+  // SSL tests
+  , '/test/functional/ssl_mongoclient_tests.js'
+  , '/test/functional/ssl_validation_tests.js'
+  , '/test/functional/ssl_x509_connect_tests.js'
 
-  // // SCRAM tests
-  // , '/test/functional/scram_tests.js'
+  // SCRAM tests
+  , '/test/functional/scram_tests.js'
 
-  // // LDAP Tests
-  // , '/test/functional/ldap_tests.js'
+  // LDAP Tests
+  , '/test/functional/ldap_tests.js'
 
-  // // Kerberos Tests
-  // , '/test/functional/kerberos_tests.js'
+  // Kerberos Tests
+  , '/test/functional/kerberos_tests.js'
 
-  // // Authentication Tests
-  // , '/test/functional/authentication_tests.js'
+  // Authentication Tests
+  , '/test/functional/authentication_tests.js'
 ]
 
 // Add all the tests to run