From: Andrew Dunstan <andrew@dunslane.net>
Date: Mon, 4 Mar 2019 20:50:23 +0000 (-0500)
Subject: Allow recovery tests to run on Windows as an admin user
X-Git-Tag: REL_12_BETA1~622
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=4eff1e9f0bf7835bee61aaaa9d6de23422a724a0;p=postgresql.git

Allow recovery tests to run on Windows as an admin user

This is the only test that fails when run as an admin user. The reason
is that when Postgres is started via pg_ctl its admin privileges are
lowered. However, this test called 'postgres -D datadir' directly,
resulting in a failure. Replace that by calling pg_ctl and then checking
the result for the expected failure, and the logfile for the expected
error message.
---

diff --git a/src/test/recovery/t/003_recovery_targets.pl b/src/test/recovery/t/003_recovery_targets.pl
index b46b318f5a3..61482fb4000 100644
--- a/src/test/recovery/t/003_recovery_targets.pl
+++ b/src/test/recovery/t/003_recovery_targets.pl
@@ -132,6 +132,11 @@ my $node_standby = get_new_node('standby_7');
 $node_standby->init_from_backup($node_master, 'my_backup', has_restoring => 1);
 $node_standby->append_conf('postgresql.conf', "recovery_target_name = '$recovery_name'
 recovery_target_time = '$recovery_time'");
-command_fails_like(['postgres', '-D', $node_standby->data_dir],
-				   qr/multiple recovery targets specified/,
-				   'multiple conflicting settings');
+
+my $res = run_log(['pg_ctl', '-D', $node_standby->data_dir,
+				   '-l', $node_standby->logfile, 'start']);
+ok(! $res, 'invalid recovery startup fails');
+
+my $logfile = slurp_file($node_standby->logfile());
+ok ($logfile =~  qr/multiple recovery targets specified/,
+	'multiple conflicting settings');