Prefix temp data dirs with the node name

alvherre · alvherre · commit cc6077d4d540 · 2016-03-02T18:22:45.000-03:00
This makes it easier to relate the temporary data dirs to each node in
a test script.

Author: Kyotaro Horiguchi
Reviewed-By: Craig Ringer, Alvaro Herrera
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
@@ -115,7 +115,7 @@ sub new
 	my $self   = {
 		_port     => $pgport,
 		_host     => $pghost,
-		_basedir  => TestLib::tempdir,
+		_basedir  => TestLib::tempdir("data_" . $name),
 		_name     => $name,
 		_logfile  => "$TestLib::log_path/${testname}_${name}.log" };
 
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -128,9 +128,11 @@ sub all_tests_passing
 #
 sub tempdir
 {
+	my ($prefix) = @_;
+	$prefix = "tmp_test" unless defined $prefix;
 	return File::Temp::tempdir(
-		'tmp_testXXXX',
-		DIR => $tmp_check,
+		$prefix . '_XXXX',
+		DIR     => $tmp_check,
 		CLEANUP => 1);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,11 @@ sub all_tests_passing`
`128`	`128`	`#`
`129`	`129`	`sub tempdir`
`130`	`130`	`{`
	`131`	`+ my ($prefix) = @_;`
	`132`	`+ $prefix = "tmp_test" unless defined $prefix;`
`131`	`133`	`return File::Temp::tempdir(`
`132`		`- 'tmp_testXXXX',`
`133`		`- DIR => $tmp_check,`
	`134`	`+ $prefix . '_XXXX',`
	`135`	`+ DIR => $tmp_check,`
`134`	`136`	`CLEANUP => 1);`
`135`	`137`	`}`
`136`	`138`