Skip to content

Commit 3abfaf5

Browse files
vmalaviya-splunkvmalaviya-splunk
authored
Merge pull request #128 from splunk/DVPL-9749
Added support for node@8.17.0 for tests
2 parents fc4e888 + 7eac86b commit 3abfaf5

36 files changed

+7281
-7233
lines changed

‎.github/workflows/mocha-test.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ on: [push, pull_request]
55
jobs:
66
build:
77
runs-on: ${{ matrix.os }}
8-
8+
99
strategy:
1010
matrix:
1111
os:
1212
- ubuntu-latest
1313
node:
1414
- 14
15+
- 8.17.0
1516
splunk-version:
1617
- "8.0"
17-
- "latest"
18-
18+
- "latest"
19+
1920
services:
2021
splunk:
2122
image: splunk/splunk:${{matrix.splunk-version}}
@@ -28,15 +29,15 @@ jobs:
2829
- 8000:8000
2930
- 8088:8088
3031
- 8089:8089
31-
32+
3233
steps:
3334
- uses: actions/checkout@v2
34-
35+
3536
- name: Use node ${{ matrix.node }}
3637
uses: actions/setup-node@v2
3738
with:
3839
node-version: ${{ matrix.node }}
39-
40+
4041
- name: Create .splunkrc file
4142
run: |
4243
cd ~
@@ -46,10 +47,10 @@ jobs:
4647
echo password=changed! >> .splunkrc
4748
echo scheme=https >> .splunkrc
4849
echo version=${{ matrix.splunk }} >> .splunkrc
49-
50+
5051
- name: Run npm install
5152
run: npm install
52-
53+
5354
- name: Run server tests
5455
run: make test
5556
env:

‎bin/cli.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@
762762
.concat(cmdline.opts.version ? makeOption("version", cmdline.opts.version) : "")
763763
.concat(cmdline.opts.password ? makeOption("password", cmdline.opts.password) : "")
764764
.concat(cmdline.opts.reporter ? makeOption("reporter", cmdline.opts.reporter.toLowerCase()) : "")
765-
.concat(cmdline.opts.ui ? makeOption("ui", cmdline.opts.ui) : ["--ui", "exports"])
765+
.concat(cmdline.opts.ui ? makeOption("ui", cmdline.opts.ui) : ["--ui", "bdd"])
766766
.concat(cmdline.opts.timeout ? makeOption("timeout", cmdline.opts.timeout) : ["--timeout", "5000"])
767767
.concat(cmdline.opts.grep ? makeOption("grep", cmdline.opts.grep) : "")
768768
.concat(cmdline.opts.exit ? "--exit" : "--exit")

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"javascript"
2222
],
2323
"scripts": {
24-
"test": "nyc mocha tests/tests.js --ui exports -t 50000 --exit"
24+
"test": "mocha tests_spike/tests.js -t 50000 --allow-uncaught --exit"
2525
},
2626
"dependencies": {
2727
"cookie": "0.4.1",
@@ -33,7 +33,7 @@
3333
"browserify": "^17.0.0",
3434
"chai": "^4.3.4",
3535
"jshint": "2.13.0",
36-
"mocha": "^9.0.2",
36+
"mocha": "7.2.0",
3737
"mustache": "4.2.0",
3838
"nyc": "^15.1.0",
3939
"readable-stream": "3.6.0",
@@ -48,4 +48,4 @@
4848
"engine": {
4949
"node": ">=0.8.0"
5050
}
51-
}
51+
}

‎tests/modularinputs/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ var splunkjs = require('../../index');
1717
splunkjs.Logger.setLevel("ALL");
1818

1919
// // Modular input tests
20-
module.exports = {
21-
'Event': require('./test_event').setup(),
22-
'InputDefinition': require('./test_input_definition').setup(),
23-
'ModularInput': require('./test_modularinput').setup(),
24-
'Scheme': require('./test_scheme').setup(),
25-
'ValidationDefinition': require('./test_validation_definition').setup(),
26-
}
20+
module.exports = (
21+
require('./test_event').setup(),
22+
require('./test_input_definition').setup(),
23+
require('./test_modularinput').setup(),
24+
require('./test_scheme').setup(),
25+
require('./test_validation_definition').setup()
26+
)
2727

‎tests/modularinputs/test_event.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ exports.setup = function () {
5757
}
5858
}
5959

60-
return {
61-
"Event tests": {
62-
beforeEach: function (done) {
60+
return (
61+
describe("Event tests", function () {
62+
this.beforeEach(function (done) {
6363
done();
64-
},
64+
});
6565

66-
"Event class handles times correctly - Date object": function (done) {
66+
it("Event class handles times correctly - Date object", function (done) {
6767
var now = Date.now();
6868
var expected = (now / 1000).toFixed(3);
6969
var found = Event.formatTime(now);
@@ -80,9 +80,9 @@ exports.setup = function () {
8080
assert.equal(otherFound, otherExpected);
8181

8282
done();
83-
},
83+
});
8484

85-
"Event class handles times correctly - String": function (done) {
85+
it("Event class handles times correctly - String", function (done) {
8686
// Test time in seconds
8787
var stringTime = "1372187084";
8888
var expected = 1372187084.000;
@@ -114,9 +114,9 @@ exports.setup = function () {
114114
assert.equal(found, expected);
115115

116116
done();
117-
},
117+
});
118118

119-
"Event class handles times correctly - Number (integer)": function (done) {
119+
it("Event class handles times correctly - Number (integer)", function (done) {
120120
// Test time in seconds
121121
var intTime = 1372187084;
122122
var expected = 1372187084.000;
@@ -142,9 +142,9 @@ exports.setup = function () {
142142
assert.equal(found, expected);
143143

144144
done();
145-
},
145+
});
146146

147-
"Event class handles times correctly - Number (float)": function (done) {
147+
it("Event class handles times correctly - Number (float)", function (done) {
148148
// Test a perfect value
149149
var floatTime = 1372187084.424;
150150
var expected = 1372187084.424;
@@ -182,9 +182,9 @@ exports.setup = function () {
182182
assert.equal(found, expected);
183183

184184
done();
185-
},
185+
});
186186

187-
"Event without enough fields throws error": function (done) {
187+
it("Event without enough fields throws error", function (done) {
188188
try {
189189
var myEvent = new Event();
190190
myEvent._writeTo(testUtils.getDuplexStream());
@@ -195,9 +195,9 @@ exports.setup = function () {
195195
assert.ok(e);
196196
}
197197
done();
198-
},
198+
});
199199

200-
"Event with minimal config matches expected XML": function (done) {
200+
it("Event with minimal config matches expected XML", function (done) {
201201
var out = testUtils.getDuplexStream();
202202

203203
var myEvent = new Event({
@@ -219,9 +219,9 @@ exports.setup = function () {
219219
assert.ok(false);
220220
}
221221
done();
222-
},
222+
});
223223

224-
"Event with full config matches expected XML": function (done) {
224+
it("Event with full config matches expected XML", function (done) {
225225
var out = testUtils.getDuplexStream();
226226

227227
var myEvent = new Event({
@@ -249,9 +249,9 @@ exports.setup = function () {
249249
assert.ok(false);
250250
}
251251
done();
252-
},
252+
});
253253

254-
"EventWriter event writing works": function (done) {
254+
it("EventWriter event writing works", function (done) {
255255
var out = testUtils.getDuplexStream();
256256
var err = testUtils.getDuplexStream();
257257

@@ -291,9 +291,9 @@ exports.setup = function () {
291291
assert.ok(false);
292292
}
293293
done();
294-
},
294+
});
295295

296-
"EventWriter gets an error from invalid Event": function (done) {
296+
it("EventWriter gets an error from invalid Event", function (done) {
297297
var out = testUtils.getDuplexStream();
298298
var err = testUtils.getDuplexStream();
299299

@@ -308,9 +308,9 @@ exports.setup = function () {
308308
assert.ok(utils.startsWith(ew._err._read(), Logger.WARN));
309309
}
310310
done();
311-
},
311+
});
312312

313-
"EventWriter logging works": function (done) {
313+
it("EventWriter logging works", function (done) {
314314
var out = testUtils.getDuplexStream();
315315
var err = testUtils.getDuplexStream();
316316

@@ -324,9 +324,9 @@ exports.setup = function () {
324324
assert.ok(false);
325325
}
326326
done();
327-
},
327+
});
328328

329-
"EventWriter XML writing works": function (done) {
329+
it("EventWriter XML writing works", function (done) {
330330
var out = testUtils.getDuplexStream();
331331
var err = testUtils.getDuplexStream();
332332

@@ -344,9 +344,9 @@ exports.setup = function () {
344344
assert.ok(false);
345345
}
346346
done();
347-
}
348-
}
349-
};
347+
});
348+
})
349+
)
350350
};
351351

352352
// Run the individual test suite

‎tests/modularinputs/test_input_definition.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ exports.setup = function () {
2525

2626
splunkjs.Logger.setLevel("ALL");
2727

28-
return {
29-
"Input Definition tests": {
30-
beforeEach: function (done) {
28+
return (
29+
describe("Input Definition tests", function (done) {
30+
this.beforeEach(function (done) {
3131
done();
32-
},
32+
});
3333

34-
"Parse produces expected result - no inputs": function (done) {
34+
it("Parse produces expected result - no inputs", function (done) {
3535
var expected = new InputDefinition();
3636
expected.metadata = {
3737
"server_host": "tiny",
@@ -54,9 +54,9 @@ exports.setup = function () {
5454
assert.ok(false);
5555
}
5656
done();
57-
},
57+
});
5858

59-
"Parse produces expected result - 2 inputs": function (done) {
59+
it("Parse produces expected result - 2 inputs", function (done) {
6060
var expected = new InputDefinition();
6161
expected.metadata = {
6262
"server_host": "tiny",
@@ -111,9 +111,9 @@ exports.setup = function () {
111111
assert.ok(false);
112112
}
113113
done();
114-
},
114+
});
115115

116-
"Parse throws an error with malformed input definition": function (done) {
116+
it("Parse throws an error with malformed input definition", function (done) {
117117
try {
118118
InputDefinition.parse(utils.readFile(__filename, "../data/conf_with_invalid_inputs.xml"));
119119
assert.ok(false);
@@ -122,11 +122,10 @@ exports.setup = function () {
122122
assert.ok(true);
123123
}
124124
done();
125-
}
126-
}
127-
};
128-
};
129-
125+
});
126+
})
127+
)
128+
}
130129
// Run the individual test suite
131130
if (module === require.cache[__filename] && !module.parent) {
132131
module.exports = exports.setup();

0 commit comments

Comments
 (0)