diff options
| author | git-marijus <mario@mariovavti.com> | 2018-03-23 10:26:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-23 10:26:26 +0100 |
| commit | 06026c1c27597c7732f5ba4629b8fe4e05f5529d (patch) | |
| tree | 4e8de80576f101195c32858926d767b872679ffd /tests | |
| parent | e2b9162a30f60ba74038c4aa999d31d5e9338d7c (diff) | |
| parent | a732b2bca1d10fe374322fd4a8996fef6e23c11a (diff) | |
| download | volse-hubzilla-06026c1c27597c7732f5ba4629b8fe4e05f5529d.tar.gz volse-hubzilla-06026c1c27597c7732f5ba4629b8fe4e05f5529d.tar.bz2 volse-hubzilla-06026c1c27597c7732f5ba4629b8fe4e05f5529d.zip | |
Merge pull request #1009 from dawnbreak/QA_testing
:construction_worker:Extend Travis, add PostgreSQL10.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/travis/prepare_pgsql.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/travis/prepare_pgsql.sh b/tests/travis/prepare_pgsql.sh index 0175b9858..c6b12e4d6 100755 --- a/tests/travis/prepare_pgsql.sh +++ b/tests/travis/prepare_pgsql.sh @@ -27,14 +27,19 @@ set -e echo "Preparing for PostgreSQL ..." +if [[ "$POSTGRESQL_VERSION" == "10" ]]; then + echo "Using PostgreSQL in Docker container, need to use TCP" + export PROTO="-h localhost" +fi + # Print out some PostgreSQL information psql --version # Why does this hang further execution of the job? -psql -U postgres -c "SELECT VERSION();" +psql $PROTO -U postgres -c "SELECT VERSION();" # Create Hubzilla database -psql -U postgres -c "DROP DATABASE IF EXISTS travis_hubzilla;" -psql -U postgres -v ON_ERROR_STOP=1 <<-EOSQL +psql $PROTO -U postgres -c "DROP DATABASE IF EXISTS travis_hubzilla;" +psql $PROTO -U postgres -v ON_ERROR_STOP=1 <<-EOSQL CREATE USER travis_hz WITH PASSWORD 'hubzilla'; CREATE DATABASE travis_hubzilla; ALTER DATABASE travis_hubzilla OWNER TO travis_hz; @@ -42,8 +47,8 @@ psql -U postgres -v ON_ERROR_STOP=1 <<-EOSQL EOSQL # Import table structure -psql -U travis_hz -v ON_ERROR_STOP=1 travis_hubzilla < ./install/schema_postgres.sql +psql $PROTO -U travis_hz -v ON_ERROR_STOP=1 travis_hubzilla < ./install/schema_postgres.sql # Show databases and tables -psql -U postgres -l -psql -U postgres -d travis_hubzilla -c "\dt;" +psql $PROTO -U postgres -l +psql $PROTO -U postgres -d travis_hubzilla -c "\dt;" |