Skip to content

[Uptime] [Test] Repurpose unit test assertions to avoid flakiness #40650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewvc merged 4 commits into from
Aug 8, 2019
Merged

[Uptime] [Test] Repurpose unit test assertions to avoid flakiness #40650

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7126990
Repurpose unit test assertions to avoid flakiness.
justinkambic Jul 9, 2019
c8b4282
Add helper function and comments to improve readability.
justinkambic Jul 23, 2019
8df5568
Merge branch 'master' into uptime_es-monitors-flaky-unit-test
justinkambic Jul 23, 2019
06ce389
Merge branch 'master' of github.com:elastic/kibana into uptime_es-mon…
andrewvc Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions ...gins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ import { DatabaseAdapter } from '../../database';
import { ElasticsearchMonitorsAdapter } from '../elasticsearch_monitors_adapter';
import { CountParams, CountResponse } from 'elasticsearch';

const assertCloseTo = (actual: number, expected: number, precision: number) => {
if (Math.abs(expected - actual) > precision) {
throw new Error(`expected [${actual}] to be within ${precision} of ${actual}`);
}
};

// FIXME: there are many untested functions in this adapter. They should be tested.
describe('ElasticsearchMonitorsAdapter', () => {
let defaultCountResponse: CountResponse;
Expand Down Expand Up @@ -81,7 +87,7 @@ describe('ElasticsearchMonitorsAdapter', () => {
});

it('getMonitorChartsData will run expected parameters when no location is specified', async () => {
expect.assertions(4);
expect.assertions(3);
const searchMock = jest.fn();
const search = searchMock.bind({});
const database = {
Expand All @@ -102,7 +108,12 @@ describe('ElasticsearchMonitorsAdapter', () => {
10
);
expect(fixedInterval).not.toBeNaN();
expect(fixedInterval).toBeCloseTo(36000, 3);

/**
* The value based on the input should be ~36000
*/
assertCloseTo(fixedInterval, 36000, 100);

set(
searchMock.mock.calls[0][1],
'body.aggs.timeseries.date_histogram.fixed_interval',
Expand All @@ -112,7 +123,7 @@ describe('ElasticsearchMonitorsAdapter', () => {
});

it('getMonitorChartsData will provide expected filters when a location is specified', async () => {
expect.assertions(4);
expect.assertions(3);
const searchMock = jest.fn();
const search = searchMock.bind({});
const database = {
Expand All @@ -133,7 +144,12 @@ describe('ElasticsearchMonitorsAdapter', () => {
10
);
expect(fixedInterval).not.toBeNaN();
expect(fixedInterval).toBeCloseTo(36000, 3);

/**
* The value based on the input should be ~36000
*/
assertCloseTo(fixedInterval, 36000, 100);

set(
searchMock.mock.calls[0][1],
'body.aggs.timeseries.date_histogram.fixed_interval',
Expand Down