db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-15 01:04:37 +02:00
Code Issues Releases Activity

Test directories are now located on the host VM rather than in the Docker container.

Browse Source 
This change allows for easier testing since all files are local on the host VM and can be easily accessed without using `docker exec`.  In addition, this change is required to allow multiple Docker containers per test case which is coming soon.
This commit is contained in:
David Steele
2016-05-10 18:12:37 -04:00
parent 60b901948a
commit a6a19e3735
5 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/lib/pgBackRestTest/Docker/ContainerTest.pm
View File

@ -19,6 +19,7 @@ use Scalar::Util qw(blessed);
use pgBackRest::Common::Ini;
use pgBackRest::Common::Log;
use pgBackRest::Common::String;
use pgBackRest::FileCommon;
use pgBackRestTest::Common::ExecuteTest;
@ -120,7 +121,7 @@ sub containerWrite
my $bForce = shift;
# Write the image
fileStringWrite("${strTempPath}/${strImageName}", "$strImage\n", false);
fileStringWrite("${strTempPath}/${strImageName}", trim($strImage) . "\n", false);
executeTest('docker build' . (defined($bForce) && $bForce ? ' --no-cache' : '') .
" -f ${strTempPath}/${strImageName} -t backrest/${strImageName} ${strTempPath}",
{bSuppressStdErr => true});
@ -500,7 +501,7 @@ sub containerBuild
# Install Perl packages
$strImage .=
"\n\n" . perlInstall($strOS) . "\n";
"\n\n" . perlInstall($strOS);
# Make PostgreSQL home group readable
$strImage .=