Skip to content

Commit 94540a6

Browse files
committed
Fixed python test cases
1 parent 82c85bd commit 94540a6

15 files changed

+119
-27
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- Subscription: test_create_subscription
2+
3+
-- DROP SUBSCRIPTION IF EXISTS test_create_subscription;
4+
5+
CREATE SUBSCRIPTION test_create_subscription
6+
CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer'
7+
PUBLICATION test_pub
8+
WITH (connect = false, enabled = false, create_slot = false, slot_name = test_create_subscription, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any', failover = true);

web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/alter_parameters_msql.sql renamed to web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/alter_failover_parameter_msql.sql

File renamed without changes.

web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/18_plus/alter_parameters.sql renamed to web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/alter_slot_name_parameter.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
CREATE SUBSCRIPTION test_create_subscription
66
CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer'
77
PUBLICATION test_pub
8-
WITH (connect = false, enabled = false, create_slot = false, slot_name = test_create_subscription, synchronous_commit = 'off', binary = false, streaming = 'False', two_phase = True, disable_on_error = false, run_as_owner = false, password_required = true, origin = 'any', failover = true);
8+
WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any', failover = true);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER SUBSCRIPTION test_create_subscription
2+
SET (slot_name = None);

web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/create_subscription.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
CREATE SUBSCRIPTION test_create_subscription
66
CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer'
77
PUBLICATION test_pub
8-
WITH (connect = false, enabled = false, create_slot = false, slot_name = test_create_subscription, synchronous_commit = 'off', binary = false, streaming = 'False', two_phase = false, disable_on_error = false, run_as_owner = false, password_required = true, origin = 'any', failover = false);
8+
WITH (connect = false, enabled = false, create_slot = false, slot_name = test_create_subscription, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any', failover = false);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CREATE SUBSCRIPTION test_create_subscription
22
CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 password=xxxxxx sslmode=prefer'
33
PUBLICATION test_pub
4-
WITH (connect = true, enabled = false, copy_data = true, create_slot = true, slot_name = test_create_subscription, synchronous_commit = 'off', binary = false, streaming = 'False', two_phase = false, disable_on_error = false, run_as_owner = false, password_required = true, origin = 'any', failover = false);
4+
WITH (connect = true, enabled = false, copy_data = false, create_slot = false, slot_name = test_create_subscription, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any', failover = false);

web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/test.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@
4545
"connect_timeout": 10,
4646
"pub": ["test_pub"],
4747
"sslmode": "prefer",
48-
"copy_data": true,
49-
"create_slot": true,
48+
"copy_data": false,
49+
"create_slot": false,
5050
"enabled": false,
5151
"connect": true,
5252
"slot_name": "test_create_subscription",
53-
"sync": "off",
54-
"streaming": false,
55-
"binary": false,
56-
"two_phase": false,
57-
"disable_on_error": false,
58-
"run_as_owner": false,
53+
"sync": "remote_apply",
54+
"streaming": true,
55+
"binary": true,
56+
"two_phase": true,
57+
"disable_on_error": true,
58+
"run_as_owner": true,
5959
"password_required": true,
6060
"origin": "any",
6161
"service": "",
@@ -66,15 +66,27 @@
6666
},
6767
{
6868
"type": "alter",
69-
"name": "Alter parameters of subscription",
69+
"name": "Alter failover parameter of subscription",
7070
"endpoint": "NODE-subscription.obj_id",
7171
"sql_endpoint": "NODE-subscription.sql_id",
7272
"msql_endpoint": "NODE-subscription.msql_id",
7373
"data": {
7474
"failover": true
7575
},
76-
"expected_sql_file": "alter_parameters.sql",
77-
"expected_msql_file": "alter_parameters_msql.sql"
76+
"expected_sql_file": "alter_failover_parameter.sql",
77+
"expected_msql_file": "alter_failover_parameter_msql.sql"
78+
},
79+
{
80+
"type": "alter",
81+
"name": "Alter slot_name parameter of subscription",
82+
"endpoint": "NODE-subscription.obj_id",
83+
"sql_endpoint": "NODE-subscription.sql_id",
84+
"msql_endpoint": "NODE-subscription.msql_id",
85+
"data": {
86+
"slot_name": "None"
87+
},
88+
"expected_sql_file": "alter_slot_name_parameter.sql",
89+
"expected_msql_file": "alter_slot_name_parameter_msql.sql"
7890
},
7991
{
8092
"type": "delete",

web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/alter_parameters.sql renamed to web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/18_plus/alter_slot_name_parameter.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
CREATE SUBSCRIPTION test_create_subscription
66
CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer'
77
PUBLICATION test_pub
8-
WITH (connect = false, enabled = false, create_slot = false, slot_name = test_create_subscription, synchronous_commit = 'off', binary = false, streaming = 'False', two_phase = false, disable_on_error = false, run_as_owner = false, password_required = true, origin = 'any', failover = true);
8+
WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any', failover = false);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER SUBSCRIPTION test_create_subscription
2+
SET (slot_name = None);
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- Subscription: test_create_subscription
2+
3+
-- DROP SUBSCRIPTION IF EXISTS test_create_subscription;
4+
5+
CREATE SUBSCRIPTION test_create_subscription
6+
CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer'
7+
PUBLICATION test_pub
8+
WITH (connect = false, enabled = false, create_slot = false, slot_name = test_create_subscription, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any', failover = false);

0 commit comments

Comments
 (0)