Skip to content

Commit 236022a

Browse files
authored
Merge pull request #5 from stackb/fix-deadline
Fix test deadline timeout
2 parents 5bc4391 + e1e57e1 commit 236022a

3 files changed

Lines changed: 30 additions & 22 deletions

File tree

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ const pb = require('./build/stack/bzl/v1beta1/application_pb');
33
const grpc_pb = require('./build/stack/bzl/v1beta1/application_grpc_pb');
44

55
module.exports = {
6-
v1beta1: Object.assign(pb, grpc_pb),
6+
v1beta1: Object.assign({}, pb, grpc_pb),
77
};

index.test.js

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ const v1beta1 = bzl.v1beta1;
66
// console.log('v1beta1', v1beta1);
77

88

9-
function newInsecureClient(address) {
10-
return new grpc.Client(address, grpc.credentials.createInsecure());
11-
}
12-
139
function newApplicationClient(address) {
1410
return new v1beta1.ApplicationClient(address, grpc.credentials.createInsecure());
1511
}
@@ -21,21 +17,33 @@ test('require() dependencies are satisfied', () => {
2117

2218
// this test is skipped as it currently requires a bzl instance to be running
2319
test.skip('connects', done => {
24-
try {
25-
const client = newApplicationClient('localhost:1080');
26-
client.waitForReady(4000, () => {
27-
client.getApplicationMetadata(
28-
new v1beta1.GetApplicationMetadataRequest(),
29-
(err, metadata) => {
30-
expect(err).toBeNull();
31-
expect(metadata).toBeDefined();
32-
expect(metadata.getName()).toBe('bzl');
33-
done();
34-
}
35-
)
36-
});
37-
} catch (err) {
38-
done(err);
39-
}
20+
const client = newApplicationClient('localhost:1080');
21+
client.waitForReady(withTimeoutSeconds(3), (err) => {
22+
if (err) {
23+
throw err;
24+
}
25+
console.log(`OK, seems ready`);
26+
try {
27+
28+
const request = new v1beta1.GetApplicationMetadataRequest();
29+
client.getApplicationMetadata(request, (err, metadata) => {
30+
expect(err).toBeNull();
31+
expect(metadata).toBeDefined();
32+
expect(metadata.getName()).toBe('bzl');
33+
expect(metadata.getVersion()).toBe('snapshot');
34+
done();
35+
});
36+
} catch (err) {
37+
done(err);
38+
} finally {
39+
// client.close();
40+
}
41+
});
42+
4043
});
4144

45+
function withTimeoutSeconds(seconds) {
46+
const deadline = new Date();
47+
deadline.setSeconds(deadline.getSeconds() + seconds);
48+
return deadline;
49+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"jest": "^26.1.0"
1919
},
2020
"scripts": {
21-
"test": "jest"
21+
"test": "jest --detectOpenHandles"
2222
},
2323
"repository": {
2424
"type": "git",

0 commit comments

Comments
 (0)