Skip to content

Commit 254ea0a

Browse files
committed
fix bgw tap tests
1 parent bb5b455 commit 254ea0a

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

test/test_bgw/test-id-bgw-mixed-case-schema.sql

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
-- ########## ID TESTS WITH BACKGROUND WORKER RUNNING ##########
22
-- Additional tests:
33
-- turn off pg_jobmon logging
4-
-- UNLOGGED
54
-- retention
65
-- fk reference
76
-- Set the pg_partman_bgw.interval setting in postgresql.conf to 10 seconds (or less) in order for this test suite to pass successfully.
@@ -19,7 +18,7 @@
1918
--BEGIN;
2019
SELECT set_config('search_path','"PartMan", public',false);
2120

22-
SELECT plan(122);
21+
SELECT plan(113);
2322
CREATE SCHEMA partman_test;
2423
CREATE SCHEMA partman_retention_test;
2524
CREATE ROLE partman_basic;
@@ -29,15 +28,15 @@ CREATE ROLE partman_owner;
2928
CREATE TABLE partman_test.fk_test_reference (col2 text unique not null);
3029
INSERT INTO partman_test.fk_test_reference VALUES ('stuff');
3130

32-
CREATE UNLOGGED TABLE partman_test.id_taptest_table (
31+
CREATE TABLE partman_test.id_taptest_table (
3332
col1 int primary key
3433
, col2 text not null default 'stuff' references partman_test.fk_test_reference (col2)
3534
, col3 timestamptz DEFAULT now() )
3635
PARTITION BY RANGE (col1);
3736
GRANT SELECT,INSERT,UPDATE ON partman_test.id_taptest_table TO partman_basic;
3837
GRANT ALL ON partman_test.id_taptest_table TO partman_revoke;
3938

40-
CREATE UNLOGGED TABLE partman_test.template_id_taptest_table (LIKE partman_test.id_taptest_table);
39+
CREATE TABLE partman_test.template_id_taptest_table (LIKE partman_test.id_taptest_table);
4140
ALTER TABLE partman_test.template_id_taptest_table ADD PRIMARY KEY (col1);
4241

4342
CREATE TABLE partman_test.undo_taptest (LIKE partman_test.id_taptest_table INCLUDING ALL);
@@ -75,12 +74,6 @@ SELECT table_privs_are('partman_test', 'id_taptest_table_p10', 'partman_revoke',
7574
SELECT table_privs_are('partman_test', 'id_taptest_table_p20', 'partman_revoke', ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER'], 'Check partman_revoke privileges of id_taptest_table_p20');
7675
SELECT table_privs_are('partman_test', 'id_taptest_table_p30', 'partman_revoke', ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER'], 'Check partman_revoke privileges of id_taptest_table_p30');
7776
SELECT table_privs_are('partman_test', 'id_taptest_table_p40', 'partman_revoke', ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER'], 'Check partman_revoke privileges of id_taptest_table_p40');
78-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table''::regclass', ARRAY['u'], 'Check that parent table is unlogged');
79-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p0''::regclass', ARRAY['u'], 'Check that id_taptest_table_p0 is unlogged');
80-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p10''::regclass', ARRAY['u'], 'Check that id_taptest_table_p10 is unlogged');
81-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p20''::regclass', ARRAY['u'], 'Check that id_taptest_table_p20 is unlogged');
82-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p30''::regclass', ARRAY['u'], 'Check that id_taptest_table_p30 is unlogged');
83-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p40''::regclass', ARRAY['u'], 'Check that id_taptest_table_p40 is unlogged');
8477

8578
SELECT results_eq('SELECT count(*)::int FROM partman_test.id_taptest_table', ARRAY[9], 'Check count from parent table');
8679
SELECT results_eq('SELECT count(*)::int FROM partman_test.id_taptest_table_p0', ARRAY[9], 'Check count from id_taptest_table_p0');
@@ -99,9 +92,7 @@ SELECT pass('Waiting 20 seconds for background worker to run...');
9992
SELECT pg_sleep(20);
10093

10194
SELECT has_table('partman_test', 'id_taptest_table_p50', 'Check id_taptest_table_p50 exists');
102-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p50''::regclass', ARRAY['u'], 'Check that id_taptest_table_p50 is unlogged');
10395
SELECT has_table('partman_test', 'id_taptest_table_p60', 'Check id_taptest_table_p60 exists');
104-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p60''::regclass', ARRAY['u'], 'Check that id_taptest_table_p60 is unlogged');
10596
SELECT hasnt_table('partman_test', 'id_taptest_table_p70', 'Check id_taptest_table_p70 doesn''t exists yet');
10697
SELECT col_is_pk('partman_test', 'id_taptest_table_p50', ARRAY['col1'], 'Check for primary key in id_taptest_table_p50');
10798
SELECT col_is_fk('partman_test', 'id_taptest_table_p50', 'col2', 'Check that foreign key was inherited to id_taptest_table_p50');
@@ -130,7 +121,6 @@ SELECT pass('Waiting 20 seconds for background worker to run...');
130121
SELECT pg_sleep(20);
131122

132123
SELECT has_table('partman_test', 'id_taptest_table_p70', 'Check id_taptest_table_p70 exists');
133-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p70''::regclass', ARRAY['u'], 'Check that id_taptest_table_p70 is unlogged');
134124
SELECT hasnt_table('partman_test', 'id_taptest_table_p80', 'Check id_taptest_table_p90 doesn''t exists yet');
135125
SELECT col_is_pk('partman_test', 'id_taptest_table_p70', ARRAY['col1'], 'Check for primary key in id_taptest_table_p70');
136126
SELECT col_is_fk('partman_test', 'id_taptest_table_p70', 'col2', 'Check that foreign key was inherited to id_taptest_table_p70');

test/test_bgw/test-id-bgw.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
--BEGIN;
1717
SELECT set_config('search_path','partman, public',false);
1818

19-
SELECT plan(122);
19+
SELECT plan(121);
2020
CREATE SCHEMA partman_test;
2121
CREATE SCHEMA partman_retention_test;
2222
CREATE ROLE partman_basic;
@@ -26,7 +26,7 @@ CREATE ROLE partman_owner;
2626
CREATE TABLE partman_test.fk_test_reference (col2 text unique not null);
2727
INSERT INTO partman_test.fk_test_reference VALUES ('stuff');
2828

29-
CREATE UNLOGGED TABLE partman_test.id_taptest_table (
29+
CREATE TABLE partman_test.id_taptest_table (
3030
col1 int primary key
3131
, col2 text not null default 'stuff' references partman_test.fk_test_reference (col2)
3232
, col3 timestamptz DEFAULT now() )
@@ -72,7 +72,7 @@ SELECT table_privs_are('partman_test', 'id_taptest_table_p10', 'partman_revoke',
7272
SELECT table_privs_are('partman_test', 'id_taptest_table_p20', 'partman_revoke', ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER'], 'Check partman_revoke privileges of id_taptest_table_p20');
7373
SELECT table_privs_are('partman_test', 'id_taptest_table_p30', 'partman_revoke', ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER'], 'Check partman_revoke privileges of id_taptest_table_p30');
7474
SELECT table_privs_are('partman_test', 'id_taptest_table_p40', 'partman_revoke', ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER'], 'Check partman_revoke privileges of id_taptest_table_p40');
75-
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table''::regclass', ARRAY['u'], 'Check that parent table is unlogged');
75+
--SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table''::regclass', ARRAY['u'], 'Check that parent table is unlogged');
7676
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p0''::regclass', ARRAY['u'], 'Check that id_taptest_table_p0 is unlogged');
7777
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p10''::regclass', ARRAY['u'], 'Check that id_taptest_table_p10 is unlogged');
7878
SELECT results_eq('SELECT relpersistence::text FROM pg_catalog.pg_class WHERE oid::regclass = ''partman_test.id_taptest_table_p20''::regclass', ARRAY['u'], 'Check that id_taptest_table_p20 is unlogged');

0 commit comments

Comments
 (0)