Fix mistakes in recovery tests
One test was relying on method remove_tree that isn't implemented in the oldest Perl we support; fix it by using the older rmtree instead. Another test had a typo in a SQL command, which isn't noticed because the PostgresNode->psql() method doesn't check that queries return correctly. That's undesirable and will also be fixed later on, but for now let's make the test actually work. Author: Craig Ringer
This commit is contained in:
parent
c7111d11b1
commit
5bec1ad464
|
@ -84,7 +84,7 @@ my $recovery_name = "my_target";
|
||||||
my $lsn4 =
|
my $lsn4 =
|
||||||
$node_master->psql('postgres', "SELECT pg_current_xlog_location();");
|
$node_master->psql('postgres', "SELECT pg_current_xlog_location();");
|
||||||
$node_master->psql('postgres',
|
$node_master->psql('postgres',
|
||||||
"SELECT pg_create_restore_point('$recovery_name'");
|
"SELECT pg_create_restore_point('$recovery_name');");
|
||||||
|
|
||||||
# Force archiving of WAL file
|
# Force archiving of WAL file
|
||||||
$node_master->psql('postgres', "SELECT pg_switch_xlog()");
|
$node_master->psql('postgres', "SELECT pg_switch_xlog()");
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# on a new timeline.
|
# on a new timeline.
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
use File::Path qw(remove_tree);
|
use File::Path qw(rmtree);
|
||||||
use PostgresNode;
|
use PostgresNode;
|
||||||
use TestLib;
|
use TestLib;
|
||||||
use Test::More tests => 1;
|
use Test::More tests => 1;
|
||||||
|
@ -46,7 +46,7 @@ $node_master->teardown_node;
|
||||||
$node_standby_1->promote;
|
$node_standby_1->promote;
|
||||||
|
|
||||||
# Switch standby 2 to replay from standby 1
|
# Switch standby 2 to replay from standby 1
|
||||||
remove_tree($node_standby_2->data_dir . '/recovery.conf');
|
rmtree($node_standby_2->data_dir . '/recovery.conf');
|
||||||
my $connstr_1 = $node_standby_1->connstr;
|
my $connstr_1 = $node_standby_1->connstr;
|
||||||
$node_standby_2->append_conf(
|
$node_standby_2->append_conf(
|
||||||
'recovery.conf', qq(
|
'recovery.conf', qq(
|
||||||
|
|
Loading…
Reference in New Issue