Individual test module and individual test run support

tests/modularinputs/test_event.js

@@ -350,6 +350,6 @@ exports.setup = function () {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     module.exports = exports.setup();
 }

tests/modularinputs/test_input_definition.js

@@ -127,6 +127,6 @@ exports.setup = function () {
     )
 }
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     module.exports = exports.setup();
 }

tests/modularinputs/test_modularinput.js

@@ -723,6 +723,6 @@ exports.setup = function () {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     module.exports = exports.setup();
 }

tests/modularinputs/test_scheme.js

@@ -146,6 +146,6 @@ exports.setup = function () {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     module.exports = exports.setup();
 }

tests/modularinputs/test_validation_definition.js

@@ -85,6 +85,6 @@ exports.setup = function () {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     module.exports = exports.setup();
 }

tests/service_tests/app.js

@@ -179,7 +179,7 @@ exports.setup = function (svc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/collection.js

@@ -61,7 +61,7 @@ exports.setup = function (svc, loggedOutSvc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/configuration.js

@@ -213,7 +213,7 @@ exports.setup = function (svc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/datamodels.js

@@ -1077,7 +1077,7 @@ exports.setup = function (svc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/endpoint.js

@@ -39,7 +39,7 @@ exports.setup = function (svc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/entity.js

@@ -115,7 +115,7 @@ exports.setup = function (svc, loggedOutSvc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/firedalerts.js

@@ -269,7 +269,7 @@ exports.setup = function (svc, loggedOutSvc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/indexes.js

@@ -432,7 +432,7 @@ exports.setup = function (svc, loggedOutSvc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/job.js

@@ -989,7 +989,7 @@ exports.setup = function (svc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/namespace.js

@@ -255,7 +255,7 @@ exports.setup = function (svc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/parser.js

@@ -31,7 +31,7 @@ exports.setup = function (svc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/pivot.js

@@ -1568,7 +1568,7 @@ exports.setup = function (svc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/properties.js

@@ -131,7 +131,7 @@ exports.setup = function (svc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/savedsearch.js

@@ -416,7 +416,7 @@ exports.setup = function (svc, loggedOutSvc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/serverinfo.js

@@ -26,7 +26,7 @@ exports.setup = function (svc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/storagepasswords.js

@@ -612,7 +612,7 @@ exports.setup = function (svc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/typeahead.js

@@ -41,7 +41,7 @@ exports.setup = function (svc, loggedOutSvc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/user.js

@@ -250,7 +250,7 @@ exports.setup = function (svc, loggedOutSvc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/service_tests/view.js

@@ -65,7 +65,7 @@ exports.setup = function (svc) {
     );
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../../index');
     var options = require('../../examples/node/cmdline');
 

tests/test_async.js

@@ -532,6 +532,6 @@ exports.setup = function () {
 };
 
 // Run the individual test suite
-// if (module === require.cache[__filename] && !module.parent) {
-//     module.exports = exports.setup();
-// }
+if (module.id === __filename && module.parent.id.includes('mocha')) {
+    module.exports = exports.setup();
+}

tests/test_context.js

@@ -1073,7 +1073,7 @@ exports.setup = function (svc) {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
 
     var options = require('../examples/node/cmdline');
     var splunkjs = require('../index');

tests/test_examples.js

@@ -473,7 +473,7 @@ exports.setup = function (svc, opts) {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
 
     var splunkjs = require('../index');
     var options = require('../examples/node/cmdline');

tests/test_http.js

@@ -306,7 +306,7 @@ exports.setup = function (http) {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../index');
     var http = new splunkjs.NodeHttp();
 

tests/test_log.js

@@ -89,6 +89,6 @@ exports.setup = function () {
 };
 
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     module.exports = exports.setup();
 }

tests/test_service.js

@@ -39,7 +39,7 @@ exports.setup = function (svc, loggedOutSvc) {
     )
 };
 
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     var splunkjs = require('../index');
     var options = require('../examples/node/cmdline');
 

tests/test_utils.js

@@ -263,6 +263,6 @@ exports.setup = function () {
     );
 }
 // Run the individual test suite
-if (module === require.cache[__filename] && !module.parent) {
+if (module.id === __filename && module.parent.id.includes('mocha')) {
     module.exports = exports.setup();
 }