fix tests

kelvich · kelvich · commit 687459b56524 · 2016-03-01T17:03:32.000+03:00
diff --git a/contrib/pglogical/Makefile b/contrib/pglogical/Makefile
@@ -27,8 +27,8 @@ include $(top_srcdir)/contrib/contrib-global.mk
 # typical installcheck users do not have (e.g. buildfarm clients).
 @installcheck: ;
 
-EXTRA_INSTALL += $(top_srcdir)/contrib/pglogical_output
-EXTRA_REGRESS_OPTS += $(top_srcdir)/contrib/pglogical/regress-postgresql.conf
+EXTRA_INSTALL += contrib/pglogical_output
+EXTRA_REGRESS_OPTS += --temp-config=./regress-postgresql.conf
 
 override CPPFLAGS := $(CPPFLAGS) -I$(top_srcdir)/contrib/pglogical_output
 
diff --git a/contrib/pglogical/regress-postgresql.conf b/contrib/pglogical/regress-postgresql.conf
@@ -17,5 +17,5 @@ fsync=off
 #log_statement = 'all'
 
 # Indirection of dsns for testing
-pglogical.provider_dsn = 'regression'
+pglogical.provider_dsn = 'contrib_regression'
 pglogical.subscriber_dsn = 'postgres'
diff --git a/contrib/pglogical/sql/init.sql b/contrib/pglogical/sql/init.sql
@@ -39,7 +39,7 @@ BEGIN
 	END IF;
 END;$$;
 
-SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := 'dbname=regression user=super');
+SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := 'dbname=contrib_regression user=super');
 
 \c :subscriber_dsn
 SET client_min_messages = 'warning';
@@ -56,7 +56,7 @@ SELECT * FROM pglogical.create_node(node_name := 'test_subscriber', dsn := 'dbna
 
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_subscription',
-    provider_dsn := 'dbname=regression user=super',
+    provider_dsn := 'dbname=contrib_regression user=super',
 	forward_origins := '{}');
 
 DO $$
diff --git a/contrib/pglogical/sql/init_fail.sql b/contrib/pglogical/sql/init_fail.sql
@@ -17,7 +17,7 @@ CREATE EXTENSION IF NOT EXISTS pglogical;
 -- fail (local node not existing)
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_subscription',
-    provider_dsn := 'dbname=regression user=nonreplica',
+    provider_dsn := 'dbname=contrib_regression user=nonreplica',
 	forward_origins := '{}');
 
 -- succeed
@@ -26,13 +26,13 @@ SELECT * FROM pglogical.create_node(node_name := 'test_subscriber', dsn := 'dbna
 -- fail (can't connect to remote)
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_subscription',
-    provider_dsn := 'dbname=regression user=nonexisting',
+    provider_dsn := 'dbname=contrib_regression user=nonexisting',
 	forward_origins := '{}');
 
 -- fail (remote node not existing)
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_subscription',
-    provider_dsn := 'dbname=regression user=nonreplica',
+    provider_dsn := 'dbname=contrib_regression user=nonreplica',
 	forward_origins := '{}');
 
 \c :provider_dsn
@@ -44,7 +44,7 @@ SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := 'dbname
 -- fail (can't connect with replication connection to remote)
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_subscription',
-    provider_dsn := 'dbname=regression user=nonreplica',
+    provider_dsn := 'dbname=contrib_regression user=nonreplica',
 	forward_origins := '{}');
 
 -- cleanup
