Skip to content

Commit

Permalink
Fix snapshot tests
Browse files Browse the repository at this point in the history
Migrate the extension_state tap test to normal regression check.
This test was causing tests against latest pg snapshot to fail.
  • Loading branch information
svenklemm committed Jul 25, 2024
1 parent 377cc15 commit d2b0213
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 126 deletions.
24 changes: 24 additions & 0 deletions test/expected/debug_utils.out
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,27 @@ SET ROLE :ROLE_DEFAULT_PERM_USER;
SELECT _timescaledb_debug.extension_state();
ERROR: permission denied for schema _timescaledb_debug at character 8
\set ON_ERROR_STOP 1
\c :TEST_DBNAME :ROLE_SUPERUSER
DO $$
DECLARE
module text;
BEGIN
SELECT probin INTO module FROM pg_proc WHERE proname = 'extension_state' AND pronamespace = '_timescaledb_debug'::regnamespace;
EXECUTE format('CREATE FUNCTION extension_state() RETURNS TEXT AS ''%s'', ''ts_extension_get_state'' LANGUAGE C', module);
END
$$;
DROP EXTENSION timescaledb;
SELECT * FROM extension_state();
extension_state
-----------------
unknown
(1 row)

\c
CREATE EXTENSION timescaledb;
SELECT * FROM extension_state();
extension_state
-----------------
created
(1 row)

14 changes: 3 additions & 11 deletions test/pgtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,7 @@ file(READ ${PG_REGRESS_DIR}/parallel_schedule PG_TEST_SCHEDULE)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testtablespace)

# Tests to ignore
set(PG_IGNORE_TESTS
advisory_lock
event_trigger
foreign_data
identity
opr_sanity
rolenames
rules
sanity_check
security_label
type_sanity)
set(PG_IGNORE_TESTS database event_trigger opr_sanity sanity_check type_sanity)

# Modify the test schedule to ignore some tests
foreach(IGNORE_TEST ${PG_IGNORE_TESTS})
Expand All @@ -45,6 +35,8 @@ foreach(IGNORE_TEST ${PG_IGNORE_TESTS})
"${PG_TEST_SCHEDULE}")
string(REPLACE " ${IGNORE_TEST} " " " PG_TEST_SCHEDULE
"${PG_TEST_SCHEDULE}")
string(REPLACE " ${IGNORE_TEST}\n" "\n" PG_TEST_SCHEDULE
"${PG_TEST_SCHEDULE}")
endif()
endforeach(IGNORE_TEST)

Expand Down
17 changes: 17 additions & 0 deletions test/sql/debug_utils.sql
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,20 @@ SET ROLE :ROLE_DEFAULT_PERM_USER;
\set ON_ERROR_STOP 0
SELECT _timescaledb_debug.extension_state();
\set ON_ERROR_STOP 1

\c :TEST_DBNAME :ROLE_SUPERUSER
DO $$
DECLARE
module text;
BEGIN
SELECT probin INTO module FROM pg_proc WHERE proname = 'extension_state' AND pronamespace = '_timescaledb_debug'::regnamespace;
EXECUTE format('CREATE FUNCTION extension_state() RETURNS TEXT AS ''%s'', ''ts_extension_get_state'' LANGUAGE C', module);
END
$$;

DROP EXTENSION timescaledb;
SELECT * FROM extension_state();

\c
CREATE EXTENSION timescaledb;
SELECT * FROM extension_state();
105 changes: 0 additions & 105 deletions test/t/001_extension.pl

This file was deleted.

File renamed without changes.
5 changes: 1 addition & 4 deletions test/t/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
if(CMAKE_BUILD_TYPE MATCHES Debug)
list(APPEND PROVE_TEST_FILES 001_extension.pl 002_replication_telemetry.pl)
list(APPEND PROVE_TEST_FILES 001_replication_telemetry.pl)
endif(CMAKE_BUILD_TYPE MATCHES Debug)

foreach(P_FILE ${PROVE_TEST_FILES})
configure_file(${P_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${P_FILE} COPYONLY)
endforeach(P_FILE)

set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
configure_file(functions.sql.in functions.sql)
6 changes: 0 additions & 6 deletions test/t/functions.sql.in

This file was deleted.

0 comments on commit d2b0213

Please sign in to comment.