diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-10-12 10:47:13 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-10-12 10:47:13 +0100 |
| commit | af85ac449d847fc4382d4381e3dae67c047b25b7 (patch) | |
| tree | 31745dd8d49ed6f44d31e5eceaf0a45c92682164 /docker/run_pg_tests.sh | |
| parent | Revert "Add a stub implementation of `StateFilter.approx_difference`" (diff) | |
| parent | Add an approximate difference method to StateFilters (#10825) (diff) | |
| download | synapse-af85ac449d847fc4382d4381e3dae67c047b25b7.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rei/gsfg_1
to introduce `approx_difference`.
Diffstat (limited to 'docker/run_pg_tests.sh')
| -rwxr-xr-x | docker/run_pg_tests.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/run_pg_tests.sh b/docker/run_pg_tests.sh index 1fd08cb62b..58e2177d34 100755 --- a/docker/run_pg_tests.sh +++ b/docker/run_pg_tests.sh @@ -10,11 +10,10 @@ set -e # Set PGUSER so Synapse's tests know what user to connect to the database with export PGUSER=postgres -# Initialise & start the database -su -c '/usr/lib/postgresql/9.6/bin/initdb -D /var/lib/postgresql/data -E "UTF-8" --lc-collate="en_US.UTF-8" --lc-ctype="en_US.UTF-8" --username=postgres' postgres -su -c '/usr/lib/postgresql/9.6/bin/pg_ctl -w -D /var/lib/postgresql/data start' postgres +# Start the database +sudo -u postgres /usr/lib/postgresql/10/bin/pg_ctl -w -D /var/lib/postgresql/data start # Run the tests cd /src export TRIAL_FLAGS="-j 4" -tox --workdir=/tmp -e py35-postgres +tox --workdir=./.tox-pg-container -e py36-postgres "$@" |