git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_rewind/t/001_basic.pl b/src/bin/pg_rewind/t/001_basic.pl

index 115192170e56819ad777053f65c0f45d227d8c17..c3293e93df7c32839162683eef1d04785199fd71 100644 (file)

--- a/src/bin/pg_rewind/t/001_basic.pl

+++ b/src/bin/pg_rewind/t/001_basic.pl

use strict;

use warnings;

use TestLib;

-use Test::More tests => 10;

+use Test::More tests => 11;

use FindBin;

use lib $FindBin::RealBin;

diff --git a/src/bin/pg_rewind/t/002_databases.pl b/src/bin/pg_rewind/t/002_databases.pl

index f1eb4fe1d2b60cffc9fa0f700fd0d43b59f7f2a8..1db534c0dc0cc70e18583b486e272d856d6ab7cf 100644 (file)

--- a/src/bin/pg_rewind/t/002_databases.pl

+++ b/src/bin/pg_rewind/t/002_databases.pl

use strict;

use warnings;

use TestLib;

-use Test::More tests => 6;

+use Test::More tests => 7;

use FindBin;

use lib $FindBin::RealBin;

diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl

index c4040bd5620d5eabb2eceaef9157a5fc64ec2032..f4710440fc3a153bac97647ff4f08da68dab9fe9 100644 (file)

--- a/src/bin/pg_rewind/t/003_extrafiles.pl

+++ b/src/bin/pg_rewind/t/003_extrafiles.pl

use strict;

use warnings;

use TestLib;

-use Test::More tests => 4;

+use Test::More tests => 5;

use File::Find;

diff --git a/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl b/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl

index ed1ddb6b60cb4ca19819ca3a321166432b667bfc..639eeb9c910c44e2fb07639243a6039037d77995 100644 (file)

--- a/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl

+++ b/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl

}

else

{

- plan tests => 4;

+ plan tests => 5;

}

use FindBin;

diff --git a/src/bin/pg_rewind/t/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm

index 68b6004e9461a62fc9e7a40de3170e45d8db0005..c540722420e1710fef70425b2ff0f50462b8997d 100644 (file)

--- a/src/bin/pg_rewind/t/RewindTest.pm

+++ b/src/bin/pg_rewind/t/RewindTest.pm

# Create custom role which is used to run pg_rewind, and adjust its

# permissions to the minimum necessary.

- $node_master->psql(

+ $node_master->safe_psql(

'postgres', "

CREATE ROLE rewind_user LOGIN;

GRANT EXECUTE ON function pg_catalog.pg_ls_dir(text, boolean, boolean)

[

'pg_rewind', "--debug",

"--source-server", $standby_connstr,

- "--target-pgdata=$master_pgdata", "--no-sync"

+ "--target-pgdata=$master_pgdata", "-R",

+ "--no-sync"

],

'pg_rewind remote');

+

+ # Check that standby.signal has been created.

+ ok(-e "$master_pgdata/standby.signal");

+

+ # Now, when pg_rewind apparently succeeded with minimal permissions,

+ # add REPLICATION privilege. So we could test that new standby

+ # is able to connect to the new master with generated config.

+ $node_standby->safe_psql('postgres',

+ "ALTER ROLE rewind_user WITH REPLICATION;");

}

else

{

"unable to set permissions for $master_pgdata/postgresql.conf");

# Plug-in rewound node to the now-promoted standby node

- my $port_standby = $node_standby->port;

- $node_master->append_conf(

- 'postgresql.conf', qq(

-primary_conninfo='port=$port_standby'

-));

+ if ($test_mode ne "remote")

+ {

+ my $port_standby = $node_standby->port;

+ $node_master->append_conf(

+ 'postgresql.conf', qq(

+primary_conninfo='port=$port_standby'));

- $node_master->set_standby_mode();

+ $node_master->set_standby_mode();

+ }

# Restart the master to check that rewind went correctly

$node_master->start;