diff options
| author | Julie Qiu <julie@golang.org> | 2021-07-13 17:20:46 -0400 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-07-16 15:05:55 +0000 |
| commit | ea375110eef8b42792c09d97929da921481ea50c (patch) | |
| tree | ee8d8be5639a639a9fc56c6d592bed0e808129b9 /devtools | |
| parent | fdb5671b250a37f81e7db8286285709bde47b557 (diff) | |
| download | go-x-pkgsite-ea375110eef8b42792c09d97929da921481ea50c.tar.xz | |
tests: move e2e/ to tests/e2e
A new tests directory is created which contains all tests that require
setup using docker and a database to be seed.
e2e/ is moved to tests/e2e.
devtools/run_e2e.sh is renamed to tests/e2e/run.sh.
A tests/README.md is added.
Change-Id: I224d71b31090ca4a9b0ff4e2adcaee8db7fa236f
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/334374
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/ci/ci.sh | 2 | ||||
| -rwxr-xr-x | devtools/run_e2e.sh | 59 |
2 files changed, 1 insertions, 60 deletions
diff --git a/devtools/ci/ci.sh b/devtools/ci/ci.sh index ffa276cb..b042be4d 100755 --- a/devtools/ci/ci.sh +++ b/devtools/ci/ci.sh @@ -102,7 +102,7 @@ print_duration_and_reset echo "----------------------------------------" echo "Running e2e tests" echo "----------------------------------------" -./devtools/run_e2e.sh +./tests/e2e/run.sh print_duration_and_reset echo diff --git a/devtools/run_e2e.sh b/devtools/run_e2e.sh deleted file mode 100755 index a0800cdf..00000000 --- a/devtools/run_e2e.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2021 The Go Authors. All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -cleanup() { - docker-compose -f devtools/docker/compose.yaml down --remove-orphans -} - -error() { - echo "" - echo "---------- ERROR: docker-compose db logs ----------" - docker-compose -f devtools/docker/compose.yaml logs db - echo "" - echo "---------- ERROR: docker-compose migrate logs ----------" - docker-compose -f devtools/docker/compose.yaml logs migrate - echo "" - echo "---------- ERROR: docker-compose seeddb logs ----------" - docker-compose -f devtools/docker/compose.yaml logs seeddb - echo "" - echo "---------- ERROR: docker-compose frontend logs ----------" - docker-compose -f devtools/docker/compose.yaml logs frontend - echo "" - echo "---------- ERROR: docker-compose chrome logs ----------" - docker-compose -f devtools/docker/compose.yaml logs chrome - echo "" - echo "---------- ERROR: docker-compose e2e logs ----------" - docker-compose -f devtools/docker/compose.yaml logs e2e - cleanup -} - -main() { - trap cleanup EXIT - trap error ERR - - local files="e2e --runInBand" - for arg in "$@"; do - if [[ $arg == e2e/* ]];then - files="" - fi - done - - export GO_DISCOVERY_SEED_DB_FILE=e2e_test_modules.txt - docker-compose -f devtools/docker/compose.yaml build && - docker-compose -f devtools/docker/compose.yaml run seeddb && - docker-compose -f devtools/docker/compose.yaml run e2e $files $@ - - local status=$? - if [ $status -eq 0 ] - then - echo "Done!" - else - echo "e2e tests failed." - fi - exit $status -} - -main $@ |