Skip to content

Commit 24632ca

Browse files
committed
integration tests: add to ci
Update existing test.yml workflow to run integration tests.
1 parent 7553244 commit 24632ca

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

.github/workflows/test.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: End-to-end test
1+
name: Integration and end-to-end tests
22

33
on:
44
pull_request:
@@ -10,7 +10,7 @@ on:
1010
default: false
1111

1212
jobs:
13-
e2e-test:
13+
tests:
1414
runs-on: ubuntu-latest
1515

1616
steps:
@@ -27,11 +27,17 @@ jobs:
2727
with:
2828
node-version: 18
2929

30-
- name: Install system dependencies for end-to-end tests
30+
- name: Install system dependencies for tests
3131
run: build/ci/install-dependencies.sh
3232
shell: bash
3333

34-
- name: Enable perf tests
34+
- name: Run integration tests
35+
run: |
36+
# Ensure only integration tests that are supported in CI are run using
37+
# the --ci flag.
38+
make integration-test INTEGRATION_FLAGS="--ci"
39+
40+
- name: Enable end-to-end perf tests
3541
if: ${{ github.event.inputs.run-all }}
3642
run: echo "E2E_FLAGS='--all'" >> $GITHUB_ENV
3743

scripts/run-integration-tests.sh

+17
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@
33
THISDIR="$( cd "$(dirname "$0")" ; pwd -P )"
44
TESTDIR="$THISDIR/../test/integration"
55

6+
# Defaults
7+
ARGS=()
8+
9+
# Parse script arguments
10+
for i in "$@"
11+
do
12+
case "$i" in
13+
--ci)
14+
ARGS+=("-p" "ci")
15+
shift # past argument
16+
;;
17+
*)
18+
die "unknown option '$i'"
19+
;;
20+
esac
21+
done
22+
623
# Exit as soon as any line fails
724
set -e
825

test/integration/features/support/daemonState.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export function getSystemDDaemonState(): DaemonState {
5050
function parseOutput(stdout: string, regex: RegExp): string {
5151
var potentialMatchParts = stdout.match(regex)
5252
if (potentialMatchParts) {
53-
return potentialMatchParts[1]
53+
return potentialMatchParts[1]
5454
}
5555
else {
5656
return 'not started'

0 commit comments

Comments
 (0)