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

Remove unused strOS parameter in Common::HostTest.

Browse Source
This commit is contained in:
David Steele
2023-04-05 11:24:53 +04:00
parent 8f7f73e4af
commit a9f39857cf
6 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/lib/pgBackRestDoc/Common/DocExecute.pm
View File

@@ -1051,7 +1051,7 @@ sub sectionChildProcess
} }
my $oHost = new pgBackRestTest::Common::HostTest( my $oHost = new pgBackRestTest::Common::HostTest(
$$hCacheKey{name}, "doc-$$hCacheKey{name}", $strImage, $strHostUser, $$hCacheKey{os}, $$hCacheKey{name}, "doc-$$hCacheKey{name}", $strImage, $strHostUser,
defined($strMount) ? [$strMount] : undef, $strOption, $$hCacheKey{param}, $$hCacheKey{'update-hosts'}); defined($strMount) ? [$strMount] : undef, $strOption, $$hCacheKey{param}, $$hCacheKey{'update-hosts'});
$self->{host}{$$hCacheKey{name}} = $oHost; $self->{host}{$$hCacheKey{name}} = $oHost;

2
test/lib/pgBackRestTest/Common/HostTest.pm
View File

@@ -37,7 +37,6 @@ sub new
$self->{strContainer}, $self->{strContainer},
$self->{strImage}, $self->{strImage},
$self->{strUser}, $self->{strUser},
$self->{strOS},
$self->{stryMount}, $self->{stryMount},
$self->{strOption}, $self->{strOption},
$self->{strParam}, $self->{strParam},
@@ -51,7 +50,6 @@ sub new
{name => 'strContainer', trace => true}, {name => 'strContainer', trace => true},
{name => 'strImage', trace => true}, {name => 'strImage', trace => true},
{name => 'strUser', trace => true}, {name => 'strUser', trace => true},
{name => 'strOS', trace => true},
{name => 'stryMount', required => false, trace => true}, {name => 'stryMount', required => false, trace => true},
{name => 'strOption', required => false, trace => true}, {name => 'strOption', required => false, trace => true},
{name => 'strParam', required => false, trace => true}, {name => 'strParam', required => false, trace => true},

2
test/lib/pgBackRestTest/Env/Host/HostAzureTest.pm
View File

@@ -64,7 +64,7 @@ sub new
my $self = $class->SUPER::new( my $self = $class->SUPER::new(
HOST_AZURE, 'test-' . testRunGet()->vmId() . '-' . HOST_AZURE, 'mcr.microsoft.com/azure-storage/azurite', 'root', HOST_AZURE, 'test-' . testRunGet()->vmId() . '-' . HOST_AZURE, 'mcr.microsoft.com/azure-storage/azurite', 'root',
'u18', ["${strFakeCertPath}/s3-server.crt:/root/public.crt:ro", "${strFakeCertPath}/s3-server.key:/root/private.key:ro"], ["${strFakeCertPath}/s3-server.crt:/root/public.crt:ro", "${strFakeCertPath}/s3-server.key:/root/private.key:ro"],
'-e AZURITE_ACCOUNTS="' . HOST_AZURE_ACCOUNT . ':' . HOST_AZURE_KEY . '"', '-e AZURITE_ACCOUNTS="' . HOST_AZURE_ACCOUNT . ':' . HOST_AZURE_KEY . '"',
'azurite-blob --blobPort 443 --blobHost 0.0.0.0 --cert=/root/public.crt --key=/root/private.key -d debug.log" 'azurite-blob --blobPort 443 --blobHost 0.0.0.0 --cert=/root/public.crt --key=/root/private.key -d debug.log"
" --disableProductStyleUrl', " --disableProductStyleUrl',

2
test/lib/pgBackRestTest/Env/Host/HostBaseTest.pm
View File

@@ -95,7 +95,7 @@ sub new
my $strContainer = 'test-' . testRunGet()->vmId() . "-$strName"; my $strContainer = 'test-' . testRunGet()->vmId() . "-$strName";
my $self = $class->SUPER::new( my $self = $class->SUPER::new(
$strName, $strContainer, $$oParam{strImage}, $$oParam{strUser}, testRunGet()->vm(), $strName, $strContainer, $$oParam{strImage}, $$oParam{strUser},
["${strProjectPath}:${strProjectPath}", "${strTestPath}:${strTestPath}", "${strBinPath}:${strBinPath}:ro"], undef, ["${strProjectPath}:${strProjectPath}", "${strTestPath}:${strTestPath}", "${strBinPath}:${strBinPath}:ro"], undef,
$oParam->{bTls} ? $oParam->{bTls} ?
'server --log-level-console=debug --tls-server-ca-file=' . testRunGet()->basePath() . HOST_SERVER_CA . 'server --log-level-console=debug --tls-server-ca-file=' . testRunGet()->basePath() . HOST_SERVER_CA .

2
test/lib/pgBackRestTest/Env/Host/HostGcsTest.pm
View File

@@ -65,7 +65,7 @@ sub new
my $strFakeCertPath = "${strProjectPath}/doc/resource/fake-cert"; my $strFakeCertPath = "${strProjectPath}/doc/resource/fake-cert";
my $self = $class->SUPER::new( my $self = $class->SUPER::new(
HOST_GCS, 'test-' . testRunGet()->vmId() . '-' . HOST_GCS, 'fsouza/fake-gcs-server', 'root', 'u18', undef, undef, undef, HOST_GCS, 'test-' . testRunGet()->vmId() . '-' . HOST_GCS, 'fsouza/fake-gcs-server', 'root', undef, undef, undef,
false); false);
bless $self, $class; bless $self, $class;

2
test/lib/pgBackRestTest/Env/Host/HostS3Test.pm
View File

@@ -67,7 +67,7 @@ sub new
my $strFakeCertPath = "${strProjectPath}/doc/resource/fake-cert"; my $strFakeCertPath = "${strProjectPath}/doc/resource/fake-cert";
my $self = $class->SUPER::new( my $self = $class->SUPER::new(
HOST_S3, 'test-' . testRunGet()->vmId() . '-s3-server', 'minio/minio:RELEASE.2022-07-30T05-21-40Z', 'root', 'u18', HOST_S3, 'test-' . testRunGet()->vmId() . '-s3-server', 'minio/minio:RELEASE.2022-07-30T05-21-40Z', 'root',
["${strFakeCertPath}/s3-server.crt:/root/.minio/certs/public.crt:ro", ["${strFakeCertPath}/s3-server.crt:/root/.minio/certs/public.crt:ro",
"${strFakeCertPath}/s3-server.key:/root/.minio/certs/private.key:ro"], "${strFakeCertPath}/s3-server.key:/root/.minio/certs/private.key:ro"],
'-e MINIO_REGION=' . HOST_S3_REGION . ' -e MINIO_DOMAIN=' . HOST_S3_ENDPOINT . ' -e MINIO_BROWSER=off' . '-e MINIO_REGION=' . HOST_S3_REGION . ' -e MINIO_DOMAIN=' . HOST_S3_ENDPOINT . ' -e MINIO_BROWSER=off' .