Merge pull request #129 from splunk/DVPL-9749

ashah-splunk · web-flow · commit 8552270d79ca · 2021-07-27T16:57:53.000+05:30
Individual test module and individual test run support changes
diff --git a/.github/workflows/mocha-test.yml b/.github/workflows/mocha-test.yml
diff --git a/tests/modularinputs/test_event.js b/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();
 }
diff --git a/tests/modularinputs/test_input_definition.js b/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();
 }
diff --git a/tests/modularinputs/test_modularinput.js b/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();
 }
diff --git a/tests/modularinputs/test_scheme.js b/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();
 }
diff --git a/tests/modularinputs/test_validation_definition.js b/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();
 }
diff --git a/tests/service_tests/app.js b/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');
 
diff --git a/tests/service_tests/collection.js b/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');
 
diff --git a/tests/service_tests/configuration.js b/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');
 
diff --git a/tests/service_tests/datamodels.js b/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');
 
diff --git a/tests/service_tests/endpoint.js b/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');
 
diff --git a/tests/service_tests/entity.js b/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');
 
diff --git a/tests/service_tests/firedalerts.js b/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');
 
diff --git a/tests/service_tests/indexes.js b/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');
 
diff --git a/tests/service_tests/job.js b/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');
 
diff --git a/tests/service_tests/namespace.js b/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');
 
diff --git a/tests/service_tests/parser.js b/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');
 
diff --git a/tests/service_tests/pivot.js b/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');
 
diff --git a/tests/service_tests/properties.js b/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');
 
diff --git a/tests/service_tests/savedsearch.js b/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');
 
diff --git a/tests/service_tests/serverinfo.js b/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');
 
diff --git a/tests/service_tests/storagepasswords.js b/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');
 
diff --git a/tests/service_tests/typeahead.js b/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');
 
diff --git a/tests/service_tests/user.js b/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');
 
diff --git a/tests/service_tests/view.js b/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');
 
diff --git a/tests/test_async.js b/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();
+}
diff --git a/tests/test_context.js b/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');
diff --git a/tests/test_examples.js b/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');
diff --git a/tests/test_http.js b/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();
 
diff --git a/tests/test_log.js b/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();
 }
diff --git a/tests/test_service.js b/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');
 
diff --git a/tests/test_utils.js b/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();
 }

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,6 @@ exports.setup = function () {`
`350`	`350`	`};`
`351`	`351`
`352`	`352`	`// Run the individual test suite`
`353`		`-if (module === require.cache[__filename] && !module.parent) {`
	`353`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`354`	`354`	`module.exports = exports.setup();`
`355`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,6 @@ exports.setup = function () {`
`127`	`127`	`)`
`128`	`128`	`}`
`129`	`129`	`// Run the individual test suite`
`130`		`-if (module === require.cache[__filename] && !module.parent) {`
	`130`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`131`	`131`	`module.exports = exports.setup();`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -723,6 +723,6 @@ exports.setup = function () {`
`723`	`723`	`};`
`724`	`724`
`725`	`725`	`// Run the individual test suite`
`726`		`-if (module === require.cache[__filename] && !module.parent) {`
	`726`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`727`	`727`	`module.exports = exports.setup();`
`728`	`728`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,6 @@ exports.setup = function () {`
`146`	`146`	`};`
`147`	`147`
`148`	`148`	`// Run the individual test suite`
`149`		`-if (module === require.cache[__filename] && !module.parent) {`
	`149`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`150`	`150`	`module.exports = exports.setup();`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,6 @@ exports.setup = function () {`
`85`	`85`	`};`
`86`	`86`
`87`	`87`	`// Run the individual test suite`
`88`		`-if (module === require.cache[__filename] && !module.parent) {`
	`88`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`89`	`89`	`module.exports = exports.setup();`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ exports.setup = function (svc) {`
`179`	`179`	`)`
`180`	`180`	`};`
`181`	`181`
`182`		`-if (module === require.cache[__filename] && !module.parent) {`
	`182`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`183`	`183`	`var splunkjs = require('../../index');`
`184`	`184`	`var options = require('../../examples/node/cmdline');`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ exports.setup = function (svc, loggedOutSvc) {`
`61`	`61`	`)`
`62`	`62`	`};`
`63`	`63`
`64`		`-if (module === require.cache[__filename] && !module.parent) {`
	`64`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`65`	`65`	`var splunkjs = require('../../index');`
`66`	`66`	`var options = require('../../examples/node/cmdline');`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ exports.setup = function (svc) {`
`213`	`213`	`)`
`214`	`214`	`};`
`215`	`215`
`216`		`-if (module === require.cache[__filename] && !module.parent) {`
	`216`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`217`	`217`	`var splunkjs = require('../../index');`
`218`	`218`	`var options = require('../../examples/node/cmdline');`
`219`	`219`
Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ exports.setup = function (svc) {`
`1077`	`1077`	`)`
`1078`	`1078`	`};`
`1079`	`1079`
`1080`		`-if (module === require.cache[__filename] && !module.parent) {`
	`1080`	`+if (module.id === __filename && module.parent.id.includes('mocha')) {`
`1081`	`1081`	`var splunkjs = require('../../index');`
`1082`	`1082`	`var options = require('../../examples/node/cmdline');`
`1083`	`1083`