Skip to content

Commit 8552270

Browse files
ashah-splunkashah-splunk
authored
Merge pull request #129 from splunk/DVPL-9749
Individual test module and individual test run support changes
2 parents 3abfaf5 + 1477d47 commit 8552270

32 files changed

+33
-90
lines changed

‎.github/workflows/mocha-test.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎tests/modularinputs/test_event.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,6 @@ exports.setup = function () {
350350
};
351351

352352
// Run the individual test suite
353-
if (module === require.cache[__filename] && !module.parent) {
353+
if (module.id === __filename && module.parent.id.includes('mocha')) {
354354
module.exports = exports.setup();
355355
}

‎tests/modularinputs/test_input_definition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ exports.setup = function () {
127127
)
128128
}
129129
// Run the individual test suite
130-
if (module === require.cache[__filename] && !module.parent) {
130+
if (module.id === __filename && module.parent.id.includes('mocha')) {
131131
module.exports = exports.setup();
132132
}

‎tests/modularinputs/test_modularinput.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,6 @@ exports.setup = function () {
723723
};
724724

725725
// Run the individual test suite
726-
if (module === require.cache[__filename] && !module.parent) {
726+
if (module.id === __filename && module.parent.id.includes('mocha')) {
727727
module.exports = exports.setup();
728728
}

‎tests/modularinputs/test_scheme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,6 @@ exports.setup = function () {
146146
};
147147

148148
// Run the individual test suite
149-
if (module === require.cache[__filename] && !module.parent) {
149+
if (module.id === __filename && module.parent.id.includes('mocha')) {
150150
module.exports = exports.setup();
151151
}

‎tests/modularinputs/test_validation_definition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ exports.setup = function () {
8585
};
8686

8787
// Run the individual test suite
88-
if (module === require.cache[__filename] && !module.parent) {
88+
if (module.id === __filename && module.parent.id.includes('mocha')) {
8989
module.exports = exports.setup();
9090
}

‎tests/service_tests/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ exports.setup = function (svc) {
179179
)
180180
};
181181

182-
if (module === require.cache[__filename] && !module.parent) {
182+
if (module.id === __filename && module.parent.id.includes('mocha')) {
183183
var splunkjs = require('../../index');
184184
var options = require('../../examples/node/cmdline');
185185

‎tests/service_tests/collection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ exports.setup = function (svc, loggedOutSvc) {
6161
)
6262
};
6363

64-
if (module === require.cache[__filename] && !module.parent) {
64+
if (module.id === __filename && module.parent.id.includes('mocha')) {
6565
var splunkjs = require('../../index');
6666
var options = require('../../examples/node/cmdline');
6767

‎tests/service_tests/configuration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ exports.setup = function (svc) {
213213
)
214214
};
215215

216-
if (module === require.cache[__filename] && !module.parent) {
216+
if (module.id === __filename && module.parent.id.includes('mocha')) {
217217
var splunkjs = require('../../index');
218218
var options = require('../../examples/node/cmdline');
219219

‎tests/service_tests/datamodels.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ exports.setup = function (svc) {
10771077
)
10781078
};
10791079

1080-
if (module === require.cache[__filename] && !module.parent) {
1080+
if (module.id === __filename && module.parent.id.includes('mocha')) {
10811081
var splunkjs = require('../../index');
10821082
var options = require('../../examples/node/cmdline');
10831083

‎tests/service_tests/endpoint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ exports.setup = function (svc) {
3939
)
4040
};
4141

42-
if (module === require.cache[__filename] && !module.parent) {
42+
if (module.id === __filename && module.parent.id.includes('mocha')) {
4343
var splunkjs = require('../../index');
4444
var options = require('../../examples/node/cmdline');
4545

‎tests/service_tests/entity.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ exports.setup = function (svc, loggedOutSvc) {
115115
)
116116
};
117117

118-
if (module === require.cache[__filename] && !module.parent) {
118+
if (module.id === __filename && module.parent.id.includes('mocha')) {
119119
var splunkjs = require('../../index');
120120
var options = require('../../examples/node/cmdline');
121121

‎tests/service_tests/firedalerts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ exports.setup = function (svc, loggedOutSvc) {
269269
)
270270
};
271271

272-
if (module === require.cache[__filename] && !module.parent) {
272+
if (module.id === __filename && module.parent.id.includes('mocha')) {
273273
var splunkjs = require('../../index');
274274
var options = require('../../examples/node/cmdline');
275275

‎tests/service_tests/indexes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ exports.setup = function (svc, loggedOutSvc) {
432432
)
433433
};
434434

435-
if (module === require.cache[__filename] && !module.parent) {
435+
if (module.id === __filename && module.parent.id.includes('mocha')) {
436436
var splunkjs = require('../../index');
437437
var options = require('../../examples/node/cmdline');
438438

‎tests/service_tests/job.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ exports.setup = function (svc) {
989989
)
990990
};
991991

992-
if (module === require.cache[__filename] && !module.parent) {
992+
if (module.id === __filename && module.parent.id.includes('mocha')) {
993993
var splunkjs = require('../../index');
994994
var options = require('../../examples/node/cmdline');
995995

‎tests/service_tests/namespace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ exports.setup = function (svc) {
255255
)
256256
};
257257

258-
if (module === require.cache[__filename] && !module.parent) {
258+
if (module.id === __filename && module.parent.id.includes('mocha')) {
259259
var splunkjs = require('../../index');
260260
var options = require('../../examples/node/cmdline');
261261

‎tests/service_tests/parser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ exports.setup = function (svc) {
3131
);
3232
};
3333

34-
if (module === require.cache[__filename] && !module.parent) {
34+
if (module.id === __filename && module.parent.id.includes('mocha')) {
3535
var splunkjs = require('../../index');
3636
var options = require('../../examples/node/cmdline');
3737

‎tests/service_tests/pivot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ exports.setup = function (svc) {
15681568
);
15691569
};
15701570

1571-
if (module === require.cache[__filename] && !module.parent) {
1571+
if (module.id === __filename && module.parent.id.includes('mocha')) {
15721572
var splunkjs = require('../../index');
15731573
var options = require('../../examples/node/cmdline');
15741574

‎tests/service_tests/properties.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ exports.setup = function (svc) {
131131
);
132132
};
133133

134-
if (module === require.cache[__filename] && !module.parent) {
134+
if (module.id === __filename && module.parent.id.includes('mocha')) {
135135
var splunkjs = require('../../index');
136136
var options = require('../../examples/node/cmdline');
137137

‎tests/service_tests/savedsearch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ exports.setup = function (svc, loggedOutSvc) {
416416
);
417417
};
418418

419-
if (module === require.cache[__filename] && !module.parent) {
419+
if (module.id === __filename && module.parent.id.includes('mocha')) {
420420
var splunkjs = require('../../index');
421421
var options = require('../../examples/node/cmdline');
422422

‎tests/service_tests/serverinfo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ exports.setup = function (svc) {
2626
);
2727
};
2828

29-
if (module === require.cache[__filename] && !module.parent) {
29+
if (module.id === __filename && module.parent.id.includes('mocha')) {
3030
var splunkjs = require('../../index');
3131
var options = require('../../examples/node/cmdline');
3232

‎tests/service_tests/storagepasswords.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ exports.setup = function (svc) {
612612
);
613613
};
614614

615-
if (module === require.cache[__filename] && !module.parent) {
615+
if (module.id === __filename && module.parent.id.includes('mocha')) {
616616
var splunkjs = require('../../index');
617617
var options = require('../../examples/node/cmdline');
618618

‎tests/service_tests/typeahead.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ exports.setup = function (svc, loggedOutSvc) {
4141
);
4242
};
4343

44-
if (module === require.cache[__filename] && !module.parent) {
44+
if (module.id === __filename && module.parent.id.includes('mocha')) {
4545
var splunkjs = require('../../index');
4646
var options = require('../../examples/node/cmdline');
4747

‎tests/service_tests/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ exports.setup = function (svc, loggedOutSvc) {
250250
);
251251
};
252252

253-
if (module === require.cache[__filename] && !module.parent) {
253+
if (module.id === __filename && module.parent.id.includes('mocha')) {
254254
var splunkjs = require('../../index');
255255
var options = require('../../examples/node/cmdline');
256256

‎tests/service_tests/view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ exports.setup = function (svc) {
6565
);
6666
};
6767

68-
if (module === require.cache[__filename] && !module.parent) {
68+
if (module.id === __filename && module.parent.id.includes('mocha')) {
6969
var splunkjs = require('../../index');
7070
var options = require('../../examples/node/cmdline');
7171

‎tests/test_async.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,6 @@ exports.setup = function () {
532532
};
533533

534534
// Run the individual test suite
535-
// if (module === require.cache[__filename] && !module.parent) {
536-
// module.exports = exports.setup();
537-
// }
535+
if (module.id === __filename && module.parent.id.includes('mocha')) {
536+
module.exports = exports.setup();
537+
}

‎tests/test_context.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ exports.setup = function (svc) {
10731073
};
10741074

10751075
// Run the individual test suite
1076-
if (module === require.cache[__filename] && !module.parent) {
1076+
if (module.id === __filename && module.parent.id.includes('mocha')) {
10771077

10781078
var options = require('../examples/node/cmdline');
10791079
var splunkjs = require('../index');

‎tests/test_examples.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ exports.setup = function (svc, opts) {
473473
};
474474

475475
// Run the individual test suite
476-
if (module === require.cache[__filename] && !module.parent) {
476+
if (module.id === __filename && module.parent.id.includes('mocha')) {
477477

478478
var splunkjs = require('../index');
479479
var options = require('../examples/node/cmdline');

‎tests/test_http.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ exports.setup = function (http) {
306306
};
307307

308308
// Run the individual test suite
309-
if (module === require.cache[__filename] && !module.parent) {
309+
if (module.id === __filename && module.parent.id.includes('mocha')) {
310310
var splunkjs = require('../index');
311311
var http = new splunkjs.NodeHttp();
312312

‎tests/test_log.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ exports.setup = function () {
8989
};
9090

9191
// Run the individual test suite
92-
if (module === require.cache[__filename] && !module.parent) {
92+
if (module.id === __filename && module.parent.id.includes('mocha')) {
9393
module.exports = exports.setup();
9494
}

‎tests/test_service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ exports.setup = function (svc, loggedOutSvc) {
3939
)
4040
};
4141

42-
if (module === require.cache[__filename] && !module.parent) {
42+
if (module.id === __filename && module.parent.id.includes('mocha')) {
4343
var splunkjs = require('../index');
4444
var options = require('../examples/node/cmdline');
4545

‎tests/test_utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,6 @@ exports.setup = function () {
263263
);
264264
}
265265
// Run the individual test suite
266-
if (module === require.cache[__filename] && !module.parent) {
266+
if (module.id === __filename && module.parent.id.includes('mocha')) {
267267
module.exports = exports.setup();
268268
}

0 commit comments

Comments
 (0)