Suppress NOTICE welcome message in tests

Suppress NOTICE in tests, either by setting client_min_messages=error or by redirecting pg_restore output (because pg_restore will clobber any client_min_messages value). Also added installation_metadata test back into CMakeList.
This commit is contained in:
Amy Tai 2018-09-11 11:53:37 -04:00 committed by RobAtticus
parent acebaea40c
commit 346191d15c
5 changed files with 8 additions and 40 deletions

View File

@ -80,25 +80,8 @@ SELECT _timescaledb_internal.test_install_timestamp() = :'timestamp_1' as timest
\! dropdb -h localhost -U super_user single
\! createdb -h localhost -U super_user single
ALTER DATABASE single SET timescaledb.restoring='on';
\! pg_restore -h localhost -U super_user -d single dump/single.sql
pg_restore: WARNING:
WELCOME TO
_____ _ _ ____________
|_ _(_) | | | _ \ ___ \
| | _ _ __ ___ ___ ___ ___ __ _| | ___| | | | |_/ /
| | | | _ ` _ \ / _ \/ __|/ __/ _` | |/ _ \ | | | ___ \
| | | | | | | | | __/\__ \ (_| (_| | | __/ |/ /| |_/ /
|_| |_|_| |_| |_|\___||___/\___\__,_|_|\___|___/ \____/
Running version 0.11.1-dev
For more information on TimescaleDB, please visit the following links:
1. Getting started: https://docs.timescale.com/getting-started
2. API reference documentation: https://docs.timescale.com/api
3. How TimescaleDB is designed: https://docs.timescale.com/introduction/architecture
Note: TimescaleDB collects anonymous reports to better understand and assist our users.
For more information and how to disable, please see our docs https://docs.timescaledb.com/using-timescaledb/telemetry.
-- Redirect to /dev/null to suppress NOTICE
\! pg_restore -h localhost -U super_user -d single dump/single.sql > /dev/null 2>&1
ALTER DATABASE single SET timescaledb.restoring='off';
\c single :ROLE_DEFAULT_PERM_USER
-- Should have all 3 row, because pg_dump includes the insertion of uuid and timestamp.

View File

@ -262,24 +262,6 @@ SELECT * FROM _timescaledb_catalog.chunk_constraint;
\! utils/pg_dump_aux_dump.sh
ALTER DATABASE single SET timescaledb.restoring='on';
\! utils/pg_dump_aux_restore.sh
pg_restore: WARNING:
WELCOME TO
_____ _ _ ____________
|_ _(_) | | | _ \ ___ \
| | _ _ __ ___ ___ ___ ___ __ _| | ___| | | | |_/ /
| | | | _ ` _ \ / _ \/ __|/ __/ _` | |/ _ \ | | | ___ \
| | | | | | | | | __/\__ \ (_| (_| | | __/ |/ /| |_/ /
|_| |_|_| |_| |_|\___||___/\___\__,_|_|\___|___/ \____/
Running version 0.12.1-dev
For more information on TimescaleDB, please visit the following links:
1. Getting started: https://docs.timescale.com/getting-started
2. API reference documentation: https://docs.timescale.com/api
3. How TimescaleDB is designed: https://docs.timescale.com/introduction/architecture
Note: TimescaleDB collects anonymous reports to better understand and assist our users.
For more information and how to disable, please see our docs https://docs.timescaledb.com/using-timescaledb/telemetry.
\c single
-- Set to OFF for future DB sessions.
ALTER DATABASE single SET timescaledb.restoring='off';

View File

@ -61,9 +61,10 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
list(APPEND TEST_FILES
bgw_launcher.sql
bgw_db_scheduler.sql
installation_metadata.sql
loader.sql
symbol_conflict.sql
net.sql
symbol_conflict.sql
telemetry.sql)
if (USE_OPENSSL)
list(APPEND TEST_FILES

View File

@ -36,7 +36,8 @@ SELECT _timescaledb_internal.test_install_timestamp() = :'timestamp_1' as timest
\! dropdb -h localhost -U super_user single
\! createdb -h localhost -U super_user single
ALTER DATABASE single SET timescaledb.restoring='on';
\! pg_restore -h localhost -U super_user -d single dump/single.sql
-- Redirect to /dev/null to suppress NOTICE
\! pg_restore -h localhost -U super_user -d single dump/single.sql > /dev/null 2>&1
ALTER DATABASE single SET timescaledb.restoring='off';
\c single :ROLE_DEFAULT_PERM_USER

View File

@ -1 +1,2 @@
${PG_BINDIR}/pg_restore -h ${PGHOST} -U ${TEST_ROLE_SUPERUSER} -d single dump/single.sql
# Redirect output to /dev/null to suppress NOTICE
${PG_BINDIR}/pg_restore -h ${PGHOST} -U ${TEST_ROLE_SUPERUSER} -d single dump/single.sql > /dev/null 2>&1