On 08/14/2015 06:32 AM, Michael Paquier wrote:
> On Fri, Aug 14, 2015 at 12:54 AM, Michael Paquier
> <michael.paqu...@gmail.com> wrote:
>> On Mon, Jun 29, 2015 at 10:11 PM, Michael Paquier
>> <michael.paqu...@gmail.com> wrote:
>>> On Wed, Mar 18, 2015 at 1:59 PM, Michael Paquier
>>> <michael.paqu...@gmail.com> wrote:
>>>> Feedback is of course welcome, but note that I am not seriously
>>>> expecting any until we get into 9.6 development cycle and I am adding
>>>> this patch to the next CF.
>>> I have moved this patch to CF 2015-09, as I have enough patches to
>>> take care of for now... Let's focus on Windows support and improvement
>>> of logging for TAP in the first round. That will be already a good
>>> step forward.
>> OK, attached is a new version of this patch, that I have largely
>> reworked to have more user-friendly routines for the tests. The number
>> of tests is still limited still it shows what this facility can do:
>> that's on purpose as it does not make much sense to code a complete
>> and complicated set of tests as long as the core routines are not
>> stable, hence let's focus on that first.
>> I have not done yet tests on Windows, I am expecting some tricks
>> needed for the archive and recovery commands generated for the tests.
> Attached is v3. I have tested and fixed the tests such as they can run
> on Windows. archive_command and restore_command are using Windows'
> copy when needed. There was also a bug with the use of a hot standby
> instead of a warm one, causing test 002 to fail.
> I am rather happy with the shape of this patch now, so feel free to review
> it...
> Regards,
Michael, I've ran these and it worked fine for me.
See attached patch with a couple of minor fixes.
Amir
diff --git a/src/test/recovery/RecoveryTest.pm b/src/test/recovery/RecoveryTest.pm
index c015f3b..5cc977d 100644
--- a/src/test/recovery/RecoveryTest.pm
+++ b/src/test/recovery/RecoveryTest.pm
@@ -11,7 +11,7 @@ package RecoveryTest;
# It is then up to the test to decide what to do with the newly-created
# node.
#
-# Environmenment configuration of each node is available through a set
+# Environment configuration of each node is available through a set
# of global variables provided by this package, hashed depending on the
# port number of a node:
# - connstr_nodes connection string to connect to this node
diff --git a/src/test/recovery/t/001_stream_rep.pl b/src/test/recovery/t/001_stream_rep.pl
index 757a639..2c59b73 100644
--- a/src/test/recovery/t/001_stream_rep.pl
+++ b/src/test/recovery/t/001_stream_rep.pl
@@ -31,9 +31,9 @@ psql $connstr_nodes{ $port_master },
my $current_lsn = psql $connstr_nodes{ $port_master },
"SELECT pg_current_xlog_location();";
my $caughtup_query = "SELECT '$current_lsn'::pg_lsn <= replay_location FROM pg_stat_replication";
-poll_query_until($caughtup_query, $connstr_nodes{ $port_master })
- or die "Timed out while waiting for standby 1 to catch up";
poll_query_until($caughtup_query, $connstr_nodes{ $port_standby_1 })
+ or die "Timed out while waiting for standby 1 to catch up";
+poll_query_until($caughtup_query, $connstr_nodes{ $port_standby_2 })
or die "Timed out while waiting for standby 2 to catch up";
my $result = psql $connstr_nodes{ $port_standby_1 },
--
2.4.3
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
