From a9f39857cf7d8c0eda9f5f19f3d4c9497d4d47f2 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Wed, 5 Apr 2023 11:24:53 +0400
Subject: [PATCH] Remove unused strOS parameter in Common::HostTest.

---
 doc/lib/pgBackRestDoc/Common/DocExecute.pm        | 2 +-
 test/lib/pgBackRestTest/Common/HostTest.pm        | 2 --
 test/lib/pgBackRestTest/Env/Host/HostAzureTest.pm | 2 +-
 test/lib/pgBackRestTest/Env/Host/HostBaseTest.pm  | 2 +-
 test/lib/pgBackRestTest/Env/Host/HostGcsTest.pm   | 2 +-
 test/lib/pgBackRestTest/Env/Host/HostS3Test.pm    | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/doc/lib/pgBackRestDoc/Common/DocExecute.pm b/doc/lib/pgBackRestDoc/Common/DocExecute.pm
index 862c57ee4..91f360b78 100644
--- a/doc/lib/pgBackRestDoc/Common/DocExecute.pm
+++ b/doc/lib/pgBackRestDoc/Common/DocExecute.pm
@@ -1051,7 +1051,7 @@ sub sectionChildProcess
                 }
 
                 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'});
 
                 $self->{host}{$$hCacheKey{name}} = $oHost;
diff --git a/test/lib/pgBackRestTest/Common/HostTest.pm b/test/lib/pgBackRestTest/Common/HostTest.pm
index 9fa41b5f7..d7d76a4e0 100644
--- a/test/lib/pgBackRestTest/Common/HostTest.pm
+++ b/test/lib/pgBackRestTest/Common/HostTest.pm
@@ -37,7 +37,6 @@ sub new
         $self->{strContainer},
         $self->{strImage},
         $self->{strUser},
-        $self->{strOS},
         $self->{stryMount},
         $self->{strOption},
         $self->{strParam},
@@ -51,7 +50,6 @@ sub new
             {name => 'strContainer', trace => true},
             {name => 'strImage', trace => true},
             {name => 'strUser', trace => true},
-            {name => 'strOS', trace => true},
             {name => 'stryMount', required => false, trace => true},
             {name => 'strOption', required => false, trace => true},
             {name => 'strParam', required => false, trace => true},
diff --git a/test/lib/pgBackRestTest/Env/Host/HostAzureTest.pm b/test/lib/pgBackRestTest/Env/Host/HostAzureTest.pm
index 0bd217e75..d882c2275 100644
--- a/test/lib/pgBackRestTest/Env/Host/HostAzureTest.pm
+++ b/test/lib/pgBackRestTest/Env/Host/HostAzureTest.pm
@@ -64,7 +64,7 @@ sub new
 
     my $self = $class->SUPER::new(
         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 . '"',
         'azurite-blob --blobPort 443 --blobHost 0.0.0.0 --cert=/root/public.crt --key=/root/private.key -d debug.log"
             " --disableProductStyleUrl',
diff --git a/test/lib/pgBackRestTest/Env/Host/HostBaseTest.pm b/test/lib/pgBackRestTest/Env/Host/HostBaseTest.pm
index a0bb97a5f..7c5d0dd21 100644
--- a/test/lib/pgBackRestTest/Env/Host/HostBaseTest.pm
+++ b/test/lib/pgBackRestTest/Env/Host/HostBaseTest.pm
@@ -95,7 +95,7 @@ sub new
     my $strContainer = 'test-' . testRunGet()->vmId() . "-$strName";
 
     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,
         $oParam->{bTls} ?
             'server --log-level-console=debug --tls-server-ca-file=' . testRunGet()->basePath() . HOST_SERVER_CA .
diff --git a/test/lib/pgBackRestTest/Env/Host/HostGcsTest.pm b/test/lib/pgBackRestTest/Env/Host/HostGcsTest.pm
index 7bd704cd3..e9f89c159 100644
--- a/test/lib/pgBackRestTest/Env/Host/HostGcsTest.pm
+++ b/test/lib/pgBackRestTest/Env/Host/HostGcsTest.pm
@@ -65,7 +65,7 @@ sub new
     my $strFakeCertPath = "${strProjectPath}/doc/resource/fake-cert";
 
     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);
     bless $self, $class;
 
diff --git a/test/lib/pgBackRestTest/Env/Host/HostS3Test.pm b/test/lib/pgBackRestTest/Env/Host/HostS3Test.pm
index cd16c4075..6575b7def 100644
--- a/test/lib/pgBackRestTest/Env/Host/HostS3Test.pm
+++ b/test/lib/pgBackRestTest/Env/Host/HostS3Test.pm
@@ -67,7 +67,7 @@ sub new
     my $strFakeCertPath = "${strProjectPath}/doc/resource/fake-cert";
 
     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.key:/root/.minio/certs/private.key:ro"],
         '-e MINIO_REGION=' . HOST_S3_REGION . ' -e MINIO_DOMAIN=' . HOST_S3_ENDPOINT . ' -e MINIO_BROWSER=off' .