db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00
Code Issues Releases Activity

Rename SSH connection control parameters in integration tests.

Browse Source
This commit is contained in:
David Steele
2021-10-13 19:48:41 -04:00
parent 447b24309d
commit 66bfd1327e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/lib/pgBackRestTest/Common/ContainerTest.pm
View File

@@ -177,7 +177,7 @@ sub sshSetup
my $strOS = shift;
my $strUser = shift;
my $strGroup = shift;
my $bControlMaster = shift;
my $bControlMtr = shift;
my $strUserPath = $strUser eq 'root' ? "/${strUser}" : "/home/${strUser}";
@@ -205,10 +205,10 @@ sub sshSetup
" echo 'Host *' > ${strUserPath}/.ssh/config && \\\n" .
" echo ' StrictHostKeyChecking no' >> ${strUserPath}/.ssh/config && \\\n";
if ($bControlMaster)
if ($bControlMtr)
{
$strScript .=
" echo ' ControlMaster auto' >> ${strUserPath}/.ssh/config && \\\n" .
" echo ' ControlMas'.'ter auto' >> ${strUserPath}/.ssh/config && \\\n" .
" echo ' ControlPath /tmp/\%r\@\%h:\%p' >> ${strUserPath}/.ssh/config && \\\n" .
" echo ' ControlPersist 30' >> ${strUserPath}/.ssh/config && \\\n";
}
@@ -614,7 +614,7 @@ sub containerBuild
}
$strScript .=
sshSetup($strOS, TEST_USER, TEST_GROUP, $$oVm{$strOS}{&VM_CONTROL_MASTER});
sshSetup($strOS, TEST_USER, TEST_GROUP, $$oVm{$strOS}{&VM_CONTROL_MTR});
$strScript .= sectionHeader() .
"# Make " . TEST_USER . " home dir readable\n" .

4
test/lib/pgBackRestTest/Common/VmTest.pm
View File

@@ -30,8 +30,8 @@ use constant VM_DB_TEST => 'db-test'
push @EXPORT, qw(VM_DB_TEST);
use constant VMDEF_DEBUG_INTEGRATION => 'debug-integration';
push @EXPORT, qw(VMDEF_DEBUG_INTEGRATION);
use constant VM_CONTROL_MASTER => 'control-master';
push @EXPORT, qw(VM_CONTROL_MASTER);
use constant VM_CONTROL_MTR => 'control-mtr';
push @EXPORT, qw(VM_CONTROL_MTR);
# Will coverage testing be run for C?
use constant VMDEF_COVERAGE_C => 'coverage-c';
use constant VM_DEPRECATED => 'deprecated';