Skip to content

Commit 6af3010

Browse files
bohandleybohandley
committed
set default timeout to 10s for tests
1 parent e6cb8bf commit 6af3010

File tree

3 files changed

+47
-49
lines changed

3 files changed

+47
-49
lines changed

‎e2e/query-editor.spec.ts

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ const codeEditorProvFile = 'code-editor.yml';
88

99
const metric = 'process_cpu_seconds_total';
1010

11-
const TIMEOUT = {timeout: 5000}
12-
1311
test.describe('Prometheus query editor', () => {
1412
test(`should have the following components:
1513
kickstart component
@@ -109,35 +107,35 @@ test.describe('Prometheus query editor', () => {
109107
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).focus();
110108

111109
await explorePage
112-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).isEnabled(TIMEOUT);
110+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).isEnabled();
113111

114112
await explorePage
115113
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton)
116-
.click(TIMEOUT)
114+
.click()
117115

118116
await explorePage
119-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric).isVisible(TIMEOUT);
117+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric).isVisible();
120118

121119
await expect(explorePage
122-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric)).toBeVisible(TIMEOUT);
120+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric)).toBeVisible();
123121

124122
await explorePage
125-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelNamesFilter).isVisible(TIMEOUT);
123+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelNamesFilter).isVisible();
126124

127125
await explorePage
128-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelValuesFilter).isVisible(TIMEOUT);
126+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.labelValuesFilter).isVisible();
129127

130128
await explorePage
131-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useQuery).isVisible(TIMEOUT);
129+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useQuery).isVisible();
132130

133131
await explorePage
134-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useAsRateQuery).isVisible(TIMEOUT);
132+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.useAsRateQuery).isVisible();
135133

136134
await explorePage
137-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.validateSelector).isVisible(TIMEOUT);
135+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.validateSelector).isVisible();
138136

139137
await explorePage
140-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.clear).isVisible(TIMEOUT);
138+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.clear).isVisible();
141139
});
142140

143141
test('selects a metric in the metrics browser and uses the query', async ({
@@ -164,11 +162,11 @@ test.describe('Prometheus query editor', () => {
164162
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).focus();
165163

166164
await explorePage
167-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).isEnabled(TIMEOUT);
165+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).isEnabled();
168166

169167
await explorePage
170168
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton)
171-
.click(TIMEOUT)
169+
.click()
172170

173171
await expect(explorePage
174172
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.selectMetric)).toBeVisible();
@@ -204,16 +202,16 @@ test.describe('Prometheus query editor', () => {
204202
await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
205203

206204
await explorePage
207-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible(TIMEOUT);
205+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible();
208206

209207
await explorePage
210-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus(TIMEOUT);
208+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus();
211209

212210
await explorePage
213-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled(TIMEOUT);
211+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled();
214212

215213
await expect(explorePage
216-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)).toBeVisible(TIMEOUT);
214+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)).toBeVisible();
217215
});
218216

219217
test('the query builder contains metric select, label filters and operations', async ({
@@ -234,19 +232,19 @@ test.describe('Prometheus query editor', () => {
234232
await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
235233

236234
await explorePage
237-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled(TIMEOUT);
235+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled();
238236

239237
await expect(explorePage
240-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)).toBeVisible(TIMEOUT);
238+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)).toBeVisible();
241239

242240
await explorePage
243-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus(TIMEOUT);
241+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus();
244242

245243
await expect(explorePage
246-
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect)).toBeVisible(TIMEOUT);
244+
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect)).toBeVisible();
247245

248246
await explorePage
249-
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).focus(TIMEOUT);
247+
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).focus();
250248

251249
await explorePage
252250
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.matchOperatorSelect).focus();
@@ -279,17 +277,17 @@ test.describe('Prometheus query editor', () => {
279277
await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
280278

281279
await explorePage
282-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible(TIMEOUT);
280+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible();
283281

284282
await explorePage
285-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled(TIMEOUT);
283+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled();
286284

287285
await explorePage
288-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus(TIMEOUT);
286+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus();
289287

290-
await explorePage.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).click(TIMEOUT)
288+
await explorePage.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).click()
291289

292-
await page.getByText(metric, { exact: true }).click(TIMEOUT);
290+
await page.getByText(metric, { exact: true }).click();
293291

294292
const hintText = await explorePage.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.hints).textContent();
295293

@@ -314,17 +312,17 @@ test.describe('Prometheus query editor', () => {
314312
await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
315313

316314
await explorePage
317-
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).isVisible(TIMEOUT);
315+
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).isVisible();
318316

319317
await explorePage
320-
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).isEnabled(TIMEOUT);
318+
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).isEnabled();
321319

322320
await explorePage
323-
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).focus(TIMEOUT);
321+
.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).focus();
324322

325-
await explorePage.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).click(TIMEOUT)
323+
await explorePage.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).click()
326324

327-
await page.getByText('__name__', { exact: true }).click(TIMEOUT);
325+
await page.getByText('__name__', { exact: true }).click();
328326

329327
await explorePage.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.valueSelect).click();
330328

@@ -351,17 +349,17 @@ test.describe('Prometheus query editor', () => {
351349
await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
352350

353351
await explorePage
354-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible(TIMEOUT);
352+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible();
355353

356354
await explorePage
357-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled(TIMEOUT);
355+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled();
358356

359357
await explorePage
360-
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus(TIMEOUT);
358+
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus();
361359

362-
await explorePage.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).click(TIMEOUT);
360+
await explorePage.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).click();
363361

364-
await page.getByText('Metrics explorer', { exact: true }).click(TIMEOUT);
362+
await page.getByText('Metrics explorer', { exact: true }).click();
365363

366364
await expect(explorePage.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricsExplorer)).toBeVisible();
367365
});

‎e2e/variable-query-editor.spec.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import { selectors } from '@grafana/e2e-selectors';
33
import { test, expect } from '@grafana/plugin-e2e';
44
import { PromOptions } from '@grafana/prometheus';
55

6-
const TIMEOUT = { timeout: 5000 };
7-
86
test.describe('Prometheus variable query editor', () => {
97
test.beforeEach('set query type', async ({
108
readProvisionedDataSource,
@@ -38,11 +36,11 @@ test.describe('Prometheus variable query editor', () => {
3836

3937
await page.getByText('Label names', { exact: true }).click();
4038

41-
await page.getByText('__name__').isVisible(TIMEOUT);
39+
await page.getByText('__name__').isVisible();
4240

43-
await page.getByText('__name__').focus(TIMEOUT);
41+
await page.getByText('__name__').focus();
4442

45-
await expect(page.getByText('__name__')).toBeVisible(TIMEOUT);
43+
await expect(page.getByText('__name__')).toBeVisible();
4644
});
4745

4846
test('label values query variable', async ({
@@ -56,11 +54,11 @@ test.describe('Prometheus variable query editor', () => {
5654

5755
await page.getByTestId(selector).click();
5856

59-
await page.getByText('__name__').isVisible(TIMEOUT);
57+
await page.getByText('__name__').isVisible();
6058

61-
await page.getByText('__name__').focus(TIMEOUT);
59+
await page.getByText('__name__').focus();
6260

63-
await page.getByText('__name__').click(TIMEOUT);
61+
await page.getByText('__name__').click();
6462

6563
await expect(variableEditPage
6664
.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)).toBeVisible();
@@ -150,10 +148,10 @@ test.describe('Prometheus variable query editor', () => {
150148

151149
await variableEditPage.getByTestIdOrAriaLabel(selector).blur();
152150

153-
await page.getByText('__name__').isVisible(TIMEOUT);
151+
await page.getByText('__name__').isVisible();
154152

155-
await page.getByText('__name__').focus(TIMEOUT);
153+
await page.getByText('__name__').focus();
156154

157-
await expect(page.getByText('__name__')).toBeVisible(TIMEOUT);
155+
await expect(page.getByText('__name__')).toBeVisible();
158156
});
159157
});

‎playwright.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ export default defineConfig({
2424
workers: process.env.CI ? 1 : undefined,
2525
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
2626
reporter: 'html',
27+
/* Timeout for each test in milliseconds. Defaults to 30 seconds. */
28+
timeout: 10000,
2729
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
2830
use: {
2931
/* Base URL to use in actions like `await page.goto('/')`. */

0 commit comments

Comments
 (0)