Skip to content

Commit a988771

Browse files
committed
ref(tests): test docs/ before building any images to fail faster
An error in the reStructuredText sources under docs/ is a hard error that will stop the tests, but the test scripts will needlessly build all the docker images before finding that out. This change tests the docs first, then moves on to component tests.
1 parent 4a2b0e2 commit a988771

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

tests/bin/test-acceptance.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ source $THIS_DIR/test-setup.sh
1717
trap cleanup EXIT
1818
trap dump_logs ERR
1919

20+
log_phase "Running documentation tests"
21+
22+
# test building documentation
23+
make -C docs/ test
24+
2025
log_phase "Building from current source tree"
2126

2227
# build all docker images and client binaries
@@ -25,10 +30,6 @@ make build
2530
# use the built client binaries
2631
export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
2732

28-
log_phase "Running documentation tests"
29-
30-
make -C docs/ test
31-
3233
log_phase "Running unit and functional tests"
3334

3435
make test-components

tests/bin/test-integration.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ source $THIS_DIR/test-setup.sh
1717
trap cleanup EXIT
1818
trap dump_logs ERR
1919

20+
log_phase "Running documentation tests"
21+
22+
# test building documentation
23+
make -C docs/ test
24+
2025
log_phase "Building from current source tree"
2126

2227
# build all docker images and client binaries
@@ -25,11 +30,6 @@ make build
2530
# use the built client binaries
2631
export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
2732

28-
log_phase "Running documentation tests"
29-
30-
# test building documentation
31-
make -C docs/ test
32-
3333
log_phase "Running unit and functional tests"
3434

3535
make test-components

tests/bin/test-smoke.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ source $THIS_DIR/test-setup.sh
1717
trap cleanup EXIT
1818
trap dump_logs ERR
1919

20+
log_phase "Running documentation tests"
21+
22+
# test building documentation
23+
make -C docs/ test
24+
2025
log_phase "Building from current source tree"
2126

2227
# build all docker images and client binaries
@@ -25,10 +30,6 @@ make build
2530
# use the built client binaries
2631
export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
2732

28-
log_phase "Running test-smoke"
29-
30-
make -C docs/ test
31-
3233
log_phase "Running unit and functional tests"
3334

3435
make test-components

0 commit comments

Comments
 (0)