external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always create database for regression tests with a fixed username. 

Otherwise the owner of relations and such will depend on the username of
the user running the regression tests. As "postgres" is the most common
username for that purpose, hardcode that in pg_regress_multi.pl.
pull/1938/head
Andres Freund 2016-02-25 18:40:11 -08:00
parent 3dae284bbe
commit e99ae630a0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/regress/pg_regress_multi.pl
View File

@ -81,6 +81,7 @@ for (my $workerIndex = 1; $workerIndex <= $workerCount; $workerIndex++) {
} }
my $host = "localhost"; my $host = "localhost";
my $user = "postgres";
my @pgOptions = (); my @pgOptions = ();
# Postgres options set for the tests # Postgres options set for the tests
@ -150,7 +151,7 @@ for my $port (@workerPorts)
} }
# Create new data directories, copy workers for speed # Create new data directories, copy workers for speed
system("$bindir/initdb", ("--nosync", "tmp_check/master/data")) == 0 system("$bindir/initdb", ("--nosync", "-U", $user, "tmp_check/master/data")) == 0
or die "Could not create master data directory"; or die "Could not create master data directory";
for my $port (@workerPorts) for my $port (@workerPorts)
@ -225,14 +226,14 @@ for my $port (@workerPorts)
for my $port (@workerPorts) for my $port (@workerPorts)
{ {
system("$bindir/psql", system("$bindir/psql",
('-h', $host, '-p', $port, "postgres", ('-h', $host, '-p', $port, '-U', $user, "postgres",
'-c', "CREATE DATABASE regression;")) == 0 '-c', "CREATE DATABASE regression;")) == 0
or die "Could not create regression database on worker"; or die "Could not create regression database on worker";
for my $extension (@extensions) for my $extension (@extensions)
{ {
system("$bindir/psql", system("$bindir/psql",
('-h', $host, '-p', $port, "regression", ('-h', $host, '-p', $port, '-U', $user, "regression",
'-c', "CREATE EXTENSION IF NOT EXISTS \"$extension\";")) == 0 '-c', "CREATE EXTENSION IF NOT EXISTS \"$extension\";")) == 0
or die "Could not create extension on worker"; or die "Could not create extension on worker";
} }
@ -240,7 +241,7 @@ for my $port (@workerPorts)
foreach my $dataType (keys %dataTypes) foreach my $dataType (keys %dataTypes)
{ {
system("$bindir/psql", system("$bindir/psql",
('-h', $host, '-p', $port, "regression", ('-h', $host, '-p', $port, '-U', $user, "regression",
'-c', "CREATE TYPE $dataType AS $dataTypes{$dataType};")) == 0 '-c', "CREATE TYPE $dataType AS $dataTypes{$dataType};")) == 0
or die "Could not create TYPE $dataType on worker"; or die "Could not create TYPE $dataType on worker";
} }
@ -248,15 +249,15 @@ for my $port (@workerPorts)
foreach my $function (keys %functions) foreach my $function (keys %functions)
{ {
system("$bindir/psql", system("$bindir/psql",
('-h', $host, '-p', $port, "regression", ('-h', $host, '-p', $port, '-U', $user, "regression",
'-c', "CREATE FUNCTION $function RETURNS $functions{$function};")) == 0 '-c', "CREATE FUNCTION $function RETURNS $functions{$function};")) == 0
or die "Could not create FUNCTION $function on worker"; or die "Could not create FUNCTION $function on worker";
} }
foreach my $fdw (keys %fdws) foreach my $fdw (keys %fdws)
{ {
system("$bindir/psql", system("$bindir/psql",
('-h', $host, '-p', $port, "regression", ('-h', $host, '-p', $port, '-U', $user, "regression",
'-c', "CREATE FOREIGN DATA WRAPPER $fdw HANDLER $fdws{$fdw};")) == 0 '-c', "CREATE FOREIGN DATA WRAPPER $fdw HANDLER $fdws{$fdw};")) == 0
or die "Could not create foreign data wrapper $fdw on worker"; or die "Could not create foreign data wrapper $fdw on worker";
} }
@ -264,7 +265,7 @@ for my $port (@workerPorts)
foreach my $fdwServer (keys %fdwServers) foreach my $fdwServer (keys %fdwServers)
{ {
system("$bindir/psql", system("$bindir/psql",
('-h', $host, '-p', $port, "regression", ('-h', $host, '-p', $port, '-U', $user, "regression",
'-c', "CREATE SERVER $fdwServer FOREIGN DATA WRAPPER $fdwServers{$fdwServer};")) == 0 '-c', "CREATE SERVER $fdwServer FOREIGN DATA WRAPPER $fdwServers{$fdwServer};")) == 0
or die "Could not create server $fdwServer on worker"; or die "Could not create server $fdwServer on worker";
} }
@ -273,7 +274,8 @@ for my $port (@workerPorts)
# Prepare pg_regress arguments # Prepare pg_regress arguments
my @arguments = ( my @arguments = (
"--host", $host, "--host", $host,
'--port', $masterPort '--port', $masterPort,
'--user', $user
); );
if ($majorversion eq '9.5') if ($majorversion eq '9.5')