Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@bitrinjani
bitrinjani committed Jan 22, 2018
1 parent 6bedcb2 commit 12072f4
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 24 deletions.
18 changes: 9 additions & 9 deletions src/__tests__/JsonConfigStore.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('JsonConfigStore', () => {
expect(store.config.minSize).toBe(0.01);
} catch (ex) {
console.log(ex);
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
store.close();
Expand Down Expand Up @@ -97,7 +97,7 @@ describe('JsonConfigStore', () => {
expect(store.config.minSize).toBe(0.01);
} catch (ex) {
console.log(ex);
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
store.close();
Expand Down Expand Up @@ -129,7 +129,7 @@ describe('JsonConfigStore', () => {
expect(store.config.minSize).toBe(0.01);
} catch (ex) {
console.log(ex);
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
store.close();
Expand All @@ -154,11 +154,11 @@ describe('JsonConfigStore', () => {
expect(store.config.minSize).toBe(0.01);
} catch (ex) {
console.log(ex);
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
store.close();
client.dispose();
if (store) store.close();
if (client) client.dispose();
}
});

Expand All @@ -179,11 +179,11 @@ describe('JsonConfigStore', () => {
expect(store.config.minSize).toBe(0.01);
} catch (ex) {
console.log(ex);
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
store.close();
client.dispose();
if (store) store.close();
if (client) client.dispose();
}
});
});
8 changes: 4 additions & 4 deletions src/__tests__/ReportService.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ describe('ReportService', () => {
expect(reply.data).toEqual(['dummy']);
await rs.stop();
} catch (ex) {
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
client.dispose();
if (client) client.dispose();
}
});

Expand Down Expand Up @@ -190,10 +190,10 @@ describe('ReportService', () => {
expect(reply.success).toBe(false);
await rs.stop();
} catch (ex) {
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
client.dispose();
if (client) client.dispose();
}
});
});
26 changes: 15 additions & 11 deletions src/__tests__/analytics.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,21 @@ describe('AnalyticsService', () => {
respond({ success: true, data: [] });
});

let as;
try {
const as = new AnalyticsService();
as = new AnalyticsService();
await as.start();
await as.stop();
await delay(10);
} catch (ex) {
console.log(ex);
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
rsPub.unbindSync(reportServicePubUrl);
configServer.dispose();
rsPub.close();
rsRep.dispose();
if (as) await as.stop();
}
});

Expand All @@ -68,10 +69,10 @@ describe('AnalyticsService', () => {
as = new AnalyticsService();
await as.start();
} catch (ex) {
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(ex.message).toBe('Failed to initial snapshot message.');
} finally {
await as.stop();
if (as) await as.stop();
await delay(10);
rsPub.unbindSync(reportServicePubUrl);
configServer.dispose();
Expand Down Expand Up @@ -106,7 +107,7 @@ describe('AnalyticsService', () => {
} catch (ex) {
expect(ex.message).toBe('Analytics failed to get the config.');
} finally {
await as.stop();
if (as) await as.stop();
await delay(10);
rsPub.unbindSync(reportServicePubUrl);
configServer.dispose();
Expand Down Expand Up @@ -142,7 +143,7 @@ describe('AnalyticsService', () => {
} catch (ex) {
expect(ex.message).toBe('Invalid JSON string received.');
} finally {
await as.stop();
if (as) await as.stop();
await delay(10);
rsPub.unbindSync(reportServicePubUrl);
rsRep.unbindSync(reportServiceRepUrl);
Expand Down Expand Up @@ -187,13 +188,14 @@ describe('AnalyticsService', () => {
await delay(100);
rsPub.send(['sometopic', 'invalid']);
await delay(100);
await as.stop();

await delay(10);
} catch (ex) {
console.log(ex);
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
if (as) await as.stop();
rsPub.unbindSync(reportServicePubUrl);
configServer.dispose();
rsPub.close();
Expand All @@ -219,16 +221,18 @@ describe('AnalyticsService', () => {
const rsRep = new SnapshotResponder(reportServiceRepUrl, (request, respond) => {
respond({ success: true, data: [] });
});
let as;
try {
const as = new AnalyticsService();
as = new AnalyticsService();
await as.start();
process.emit('message', 'invalid', undefined);
process.emit('message', 'stop', undefined);
await delay(10);
} catch (ex) {
if (process.env.CI && ex.message === 'address already in use') return;
if (process.env.CI && ex.message === 'Address already in use') return;
expect(true).toBe(false);
} finally {
if (as) await as.stop();
rsPub.unbindSync(reportServicePubUrl);
configServer.dispose();
rsPub.close();
Expand Down

0 comments on commit 12072f4

Please sign in to comment.