Skip to content

Commit 9f2483d

Browse files
author
Kerkesni
committed
BB-295 - fix functional tests
1 parent 488a81b commit 9f2483d

File tree

6 files changed

+31
-15
lines changed

6 files changed

+31
-15
lines changed

.github/workflows/tests.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,10 @@ jobs:
134134
BACKBEAT_CONFIG_FILE: "tests/config.json"
135135
- name: run backbeat notification feature tests
136136
run: yarn run ft_test:notification
137-
138137
- name: run ballooning tests for lifecycle conductor
139-
run: yarn jest tests/performance/lifecycle/conductor-check-memory-balloon.js
138+
run: .github/scripts/run_ft_tests.bash perf_test:lifecycle
140139
env:
141-
# Constrain heap long-lived heap size to 150MB, so that pushing 200K messages
140+
# Constrain heap long-lived heap size to 200MB, so that pushing 200K messages
142141
# will crash if they end up in memory all at the same time (circuit breaking
143142
# ineffective) while waiting to be committed to the kafka topic.
144-
NODE_OPTIONS: '--max-old-space-size=150'
143+
NODE_OPTIONS: '--max-old-space-size=200'

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"ft_test:ingestion": "jest /functional/ingestion --forceExit --testTimeout 30000",
2727
"ft_test:api:routes": "jest /functional/api/routes.spec.js --forceExit --testTimeout 30000",
2828
"ft_test:api:retry": "jest /functional/api/retry.spec.js --forceExit --testTimeout 30000",
29+
"perf_test:lifecycle": "jest /performance/lifecycle/ --forceExit --testTimeout 30000",
2930
"bh_test": "jest /behavior",
3031
"lint": "eslint $(git ls-files '*.js')",
3132
"lint_md": "mdlint $(git ls-files '[^bucket-scanner/]*.md')",

tests/functional/lib/BackbeatClient.spec.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('BackbeatClient unit tests with mock server', () => {
6969
const destReq = backbeatClient.getRaftId({
7070
Bucket: bucketName,
7171
});
72-
return destReq.send((err, data) => {
72+
destReq.send((err, data) => {
7373
assert.ifError(err);
7474
assert.strictEqual(data[0], '1');
7575
return done();
@@ -80,7 +80,7 @@ describe('BackbeatClient unit tests with mock server', () => {
8080
const destReq = backbeatClient.getRaftLog({
8181
LogId: '1',
8282
});
83-
return destReq.send((err, data) => {
83+
destReq.send((err, data) => {
8484
assert.ifError(err);
8585
assert.deepStrictEqual(data, expectedLogs);
8686
return done();
@@ -91,7 +91,7 @@ describe('BackbeatClient unit tests with mock server', () => {
9191
const destReq = backbeatClient.getBucketMetadata({
9292
Bucket: bucketName,
9393
});
94-
return destReq.send((err, data) => {
94+
destReq.send((err, data) => {
9595
assert.ifError(err);
9696
const bucketMd = dummyBucketMD[bucketName];
9797
const expectedBucketMD = new BucketInfo(bucketMd.name,
@@ -119,7 +119,7 @@ describe('BackbeatClient unit tests with mock server', () => {
119119
const destReq = backbeatClient.getObjectList({
120120
Bucket: bucketName,
121121
});
122-
return destReq.send((err, data) => {
122+
destReq.send((err, data) => {
123123
assert.ifError(err);
124124
assert.deepStrictEqual(data, expectedObjectList);
125125
return done();
@@ -131,7 +131,7 @@ describe('BackbeatClient unit tests with mock server', () => {
131131
Bucket: bucketName,
132132
Key: objectName,
133133
});
134-
return destReq.send((err, data) => {
134+
destReq.send((err, data) => {
135135
assert.ifError(err);
136136
assert(data.Body);
137137
const dataValue = JSON.parse(data.Body);
@@ -144,7 +144,7 @@ describe('BackbeatClient unit tests with mock server', () => {
144144
const destReq = backbeatClient.getBucketCseq({
145145
Bucket: bucketName,
146146
});
147-
return destReq.send((err, data) => {
147+
destReq.send((err, data) => {
148148
assert.ifError(err);
149149
assert(data[0] && data[0].cseq);
150150
assert.strictEqual(data[0].cseq, 7);

tests/functional/lib/BackbeatConsumer.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ describe('BackbeatConsumer main tests', () => {
121121
setTimeout(() => {
122122
_checkZkMetrics(() => {
123123
consumeCb();
124-
consumer.unsubscribe();
124+
consumer.pause();
125125
});
126126
}, 5000);
127127
assert.deepStrictEqual(
@@ -142,7 +142,7 @@ describe('BackbeatConsumer main tests', () => {
142142
'messages from the previous offset', done => {
143143
let totalConsumed = 0;
144144
const kafkaConsumer = consumer._consumer;
145-
consumer.subscribe();
145+
consumer.resume();
146146

147147
async.series([
148148
next => {

tests/functional/notification/NotificationConfigManager.spec.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,21 @@ const notificationConfigurationVariant = {
3131
],
3232
};
3333

34+
class MockChangeStream extends events.EventEmitter {
35+
constructor() {
36+
super();
37+
this.closed = false;
38+
}
39+
40+
isClosed() {
41+
return this.closed;
42+
}
43+
44+
close() {
45+
this.closed = true;
46+
}
47+
}
48+
3449
describe('NotificationConfigManager ::', () => {
3550
const params = {
3651
mongoConfig,
@@ -42,7 +57,7 @@ describe('NotificationConfigManager ::', () => {
4257
manager = new NotificationConfigManager(params);
4358
const getCollectionStub = sinon.stub().returns({
4459
// mock change stream
45-
watch: () => new events.EventEmitter(),
60+
watch: () => new MockChangeStream(),
4661
// mock bucket notification configuration
4762
findOne: () => (
4863
{

tests/functional/replication/queueProcessor.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ describe('queue processor functional tests with mocking', () => {
879879

880880
afterAll(done => {
881881
httpServer.close();
882-
async.parallel([
882+
async.series([
883883
done => queueProcessorSF.stop(done),
884884
done => queueProcessorAzure.stop(done),
885885
done => replicationStatusProcessor.stop(done),
@@ -905,7 +905,8 @@ describe('queue processor functional tests with mocking', () => {
905905
nbParts: 2,
906906
encrypted: true },
907907
{ caption: 'empty object',
908-
nbParts: 0 }].forEach(testCase => describe(testCase.caption, () => {
908+
nbParts: 0 },
909+
].forEach(testCase => describe(testCase.caption, () => {
909910
beforeAll(() => {
910911
s3mock.setParam('nbParts', testCase.nbParts);
911912
if (testCase.encrypted) {

0 commit comments

Comments
 (0)