Skip to content

Commit 6d01598

Browse files
kdumontnukdumontnu
committed
Don't use test logger for e2e tests
1 parent a6e660a commit 6d01598

File tree

9 files changed

+35
-19
lines changed

9 files changed

+35
-19
lines changed

‎Makefile‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,9 @@ gomod-check: tidy
399399
fi
400400

401401
generate-ini-sqlite:
402+
$(TEST_LOGGER) ?= test,file
402403
sed -e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
404+
-e 's|{{TEST_LOGGER}}|${TEST_LOGGER}|g' \
403405
integrations/sqlite.ini.tmpl > integrations/sqlite.ini
404406

405407
.PHONY: test-sqlite
@@ -421,11 +423,13 @@ test-sqlite-migration\#%: migrations.sqlite.test migrations.individual.sqlite.t
421423

422424

423425
generate-ini-mysql:
426+
$(TEST_LOGGER) ?= test,file
424427
sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
425428
-e 's|{{TEST_MYSQL_DBNAME}}|${TEST_MYSQL_DBNAME}|g' \
426429
-e 's|{{TEST_MYSQL_USERNAME}}|${TEST_MYSQL_USERNAME}|g' \
427430
-e 's|{{TEST_MYSQL_PASSWORD}}|${TEST_MYSQL_PASSWORD}|g' \
428431
-e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
432+
-e 's|{{TEST_LOGGER}}|${TEST_LOGGER}|g' \
429433
integrations/mysql.ini.tmpl > integrations/mysql.ini
430434

431435
.PHONY: test-mysql
@@ -442,11 +446,13 @@ test-mysql-migration: migrations.mysql.test migrations.individual.mysql.test gen
442446
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./migrations.individual.mysql.test
443447

444448
generate-ini-mysql8:
449+
$(TEST_LOGGER) ?= test,file
445450
sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
446451
-e 's|{{TEST_MYSQL8_DBNAME}}|${TEST_MYSQL8_DBNAME}|g' \
447452
-e 's|{{TEST_MYSQL8_USERNAME}}|${TEST_MYSQL8_USERNAME}|g' \
448453
-e 's|{{TEST_MYSQL8_PASSWORD}}|${TEST_MYSQL8_PASSWORD}|g' \
449454
-e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
455+
-e 's|{{TEST_LOGGER}}|${TEST_LOGGER}|g' \
450456
integrations/mysql8.ini.tmpl > integrations/mysql8.ini
451457

452458
.PHONY: test-mysql8
@@ -463,12 +469,14 @@ test-mysql8-migration: migrations.mysql8.test migrations.individual.mysql8.test
463469
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./migrations.individual.mysql8.test
464470

465471
generate-ini-pgsql:
472+
$(TEST_LOGGER) ?= test,file
466473
sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
467474
-e 's|{{TEST_PGSQL_DBNAME}}|${TEST_PGSQL_DBNAME}|g' \
468475
-e 's|{{TEST_PGSQL_USERNAME}}|${TEST_PGSQL_USERNAME}|g' \
469476
-e 's|{{TEST_PGSQL_PASSWORD}}|${TEST_PGSQL_PASSWORD}|g' \
470477
-e 's|{{TEST_PGSQL_SCHEMA}}|${TEST_PGSQL_SCHEMA}|g' \
471478
-e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
479+
-e 's|{{TEST_LOGGER}}|${TEST_LOGGER}|g' \
472480
integrations/pgsql.ini.tmpl > integrations/pgsql.ini
473481

474482
.PHONY: test-pgsql
@@ -485,11 +493,13 @@ test-pgsql-migration: migrations.pgsql.test migrations.individual.pgsql.test gen
485493
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./migrations.individual.pgsql.test
486494

487495
generate-ini-mssql:
496+
$(TEST_LOGGER) ?= test,file
488497
sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
489498
-e 's|{{TEST_MSSQL_DBNAME}}|${TEST_MSSQL_DBNAME}|g' \
490499
-e 's|{{TEST_MSSQL_USERNAME}}|${TEST_MSSQL_USERNAME}|g' \
491500
-e 's|{{TEST_MSSQL_PASSWORD}}|${TEST_MSSQL_PASSWORD}|g' \
492501
-e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
502+
-e 's|{{TEST_LOGGER}}|${TEST_LOGGER}|g' \
493503
integrations/mssql.ini.tmpl > integrations/mssql.ini
494504

495505
.PHONY: test-mssql
@@ -505,6 +515,9 @@ test-mssql-migration: migrations.mssql.test migrations.individual.mssql.test gen
505515
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast
506516
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./migrations.individual.mssql.test -test.failfast
507517

518+
# Use only file logging for end-to-end tests
519+
test-e2e%: TEST_LOGGER = file
520+
508521
.PHONY: test-e2e
509522
test-e2e: test-e2e-sqlite
510523

@@ -513,48 +526,47 @@ test-e2e\#%: test-e2e-sqlite\#%
513526
# Kind of a hack to get makefile to accept passing arguement
514527
true
515528

516-
# Can I share the database with integration tests? Is it cleaned up between tests?
517529
.PHONY: test-e2e-sqlite
518-
test-e2e-sqlite: GOFLAGS+=sqlite sqlite_unlock_notify
530+
test-e2e-sqlite: TAGS+=sqlite sqlite_unlock_notify
519531
test-e2e-sqlite: build generate-ini-sqlite
520532
npx playwright install $(PLAYWRIGHT_FLAGS)
521-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/sqlite.ini ./tools/e2e/run_e2e.sh
533+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3003" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/sqlite.ini ./tools/e2e/run_e2e.sh
522534

523535
.PHONY: test-e2e-sqlite\#%
524-
test-e2e-sqlite\#%: GOFLAGS+=sqlite sqlite_unlock_notify
536+
test-e2e-sqlite\#%: TAGS+=sqlite sqlite_unlock_notify
525537
test-e2e-sqlite\#%: build generate-ini-sqlite
526538
npx playwright install $(PLAYWRIGHT_FLAGS)
527-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/sqlite.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
539+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3003" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/sqlite.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
528540

529541
.PHONY: test-e2e-mysql8
530542
test-e2e-mysql8: build generate-ini-mysql8
531543
npx playwright install $(PLAYWRIGHT_FLAGS)
532-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mysql8.ini ./tools/e2e/run_e2e.sh
544+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3004" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mysql8.ini ./tools/e2e/run_e2e.sh
533545

534546
.PHONY: test-e2e-mysql8\#%
535547
test-e2e-mysql8\#%: build generate-ini-mysql8
536548
npx playwright install $(PLAYWRIGHT_FLAGS)
537-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mysql8.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
549+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3004" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mysql8.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
538550

539551
.PHONY: test-e2e-pgsql
540552
test-e2e-pgsql: build generate-ini-pgsql
541553
npx playwright install $(PLAYWRIGHT_FLAGS)
542-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/pgsql.ini ./tools/e2e/run_e2e.sh
554+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3002" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/pgsql.ini ./tools/e2e/run_e2e.sh
543555

544556
.PHONY: test-e2e-pgsql\#%
545557
test-e2e-pgsql\#%: build generate-ini-pgsql
546558
npx playwright install $(PLAYWRIGHT_FLAGS)
547-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/pgsql.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
559+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3002" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/pgsql.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
548560

549561
.PHONY: test-e2e-mssql
550562
test-e2e-mssql: build generate-ini-mssql
551563
npx playwright install $(PLAYWRIGHT_FLAGS)
552-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mssql.ini ./tools/e2e/run_e2e.sh
564+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3003" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mssql.ini ./tools/e2e/run_e2e.sh
553565

554566
.PHONY: test-e2e-mssql\#%
555567
test-e2e-mssql\#%: build generate-ini-mssql
556568
npx playwright install $(PLAYWRIGHT_FLAGS)
557-
GITEA_ROOT=$(CURDIR) GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mssql.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
569+
GITEA_ROOT=$(CURDIR) GITEA_URL="http://localhost:3003" GITEA_EXECUTABLE=$(EXECUTABLE) GITEA_CONF=integrations/mssql.ini E2E_TESTS=$* ./tools/e2e/run_e2e.sh
558570

559571
.PHONY: bench-sqlite
560572
bench-sqlite: integrations.sqlite.test generate-ini-sqlite

‎integrations/mssql.ini.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ PROVIDER = file
8282
PROVIDER_CONFIG = integrations/gitea-integration-mssql/data/sessions
8383

8484
[log]
85-
MODE = test,file
85+
MODE = {{TEST_LOGGER}}
8686
ROOT_PATH = {{REPO_TEST_DIR}}mssql-log
8787
ROUTER = ,
8888
XORM = file

‎integrations/mysql.ini.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ PROVIDER = file
101101
PROVIDER_CONFIG = integrations/gitea-integration-mysql/data/sessions
102102

103103
[log]
104-
MODE = test,file
104+
MODE = {{TEST_LOGGER}}
105105
ROOT_PATH = {{REPO_TEST_DIR}}mysql-log
106106
ROUTER = ,
107107
XORM = file

‎integrations/mysql8.ini.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ PROVIDER = file
7979
PROVIDER_CONFIG = integrations/gitea-integration-mysql8/data/sessions
8080

8181
[log]
82-
MODE = test,file
82+
MODE = {{TEST_LOGGER}}
8383
ROOT_PATH = {{REPO_TEST_DIR}}mysql8-log
8484
ROUTER = ,
8585
XORM = file

‎integrations/pgsql.ini.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ PROVIDER = file
8383
PROVIDER_CONFIG = integrations/gitea-integration-pgsql/data/sessions
8484

8585
[log]
86-
MODE = test,file
86+
MODE = {{TEST_LOGGER}}
8787
ROOT_PATH = {{REPO_TEST_DIR}}pgsql-log
8888
ROUTER = ,
8989
XORM = file

‎integrations/sqlite.ini.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ PROVIDER = file
7878
PROVIDER_CONFIG = integrations/gitea-integration-sqlite/data/sessions
7979

8080
[log]
81-
MODE = test,file
81+
MODE = {{TEST_LOGGER}}
8282
ROOT_PATH = {{REPO_TEST_DIR}}sqlite-log
8383
ROUTER = ,
8484
XORM = file

‎playwright.config.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// @ts-check
22
import {devices} from '@playwright/test';
33

4+
const BASE_URL = process.env.GITEA_URL? process.env.GITEA_URL: 'http://localhost:3000';
5+
46
/**
57
* @see https://playwright.dev/docs/test-configuration
68
* @type {import('@playwright/test').PlaywrightTestConfig}
@@ -46,7 +48,7 @@ const config = {
4648
navigationTimeout: 5 * 1000,
4749

4850
/* Base URL to use in actions like `await page.goto('/')`. */
49-
baseURL: 'http://localhost:3000',
51+
baseURL: BASE_URL,
5052

5153
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
5254
trace: 'on-first-retry',

‎tools/e2e/run_e2e.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
./${GITEA_EXECUTABLE:-gitea} web --quiet &
4+
[[ -z "${GITEA_CONF}" ]] && GiteaConfig='' || GiteaConfig="-C . -c ${GITEA_CONF}"
5+
6+
./${GITEA_EXECUTABLE:-gitea} ${GiteaConfig} --quiet web &
57
npx playwright test ${E2E_TESTS:-""}
68

79
trap 'kill $(jobs -p)' EXIT

‎tools/e2e/tests/example.test.e2e.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import {test, expect} from '@playwright/test';
44
test('Load Homepage', async ({page}) => {
55
const response = await page.goto('/');
66
await expect(response.status()).toBe(200); // Status OK
7-
await expect(page).toHaveTitle(/^Gitea: Test\s*$/);
7+
await expect(page).toHaveTitle(/^Gitea: Git with a cup of tea\s*$/);
88
await expect(page.locator('.logo')).toHaveAttribute('src', '/assets/img/logo.svg');
99
});

0 commit comments

Comments
 (0)