aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2018-04-10 12:48:07 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2018-04-10 13:15:21 +0100
commitf0c0683aeacc2ab99702c628240b35be3688ec1d (patch)
tree8df7c6c5139d944cbe4bef1c4c4cd71ffb0e9095
parentdab5ffe6c69a20dc21c05510cbaa44c006812b7c (diff)
Fix again test script running on PostgreSQL 9.1.
It was not enough to move the schema to a separate run, the two fixtures need to be separate too.
-rw-r--r--perllib/FixMyStreet/TestAppProve.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/TestAppProve.pm b/perllib/FixMyStreet/TestAppProve.pm
index f0f5cab59..0329bcfde 100644
--- a/perllib/FixMyStreet/TestAppProve.pm
+++ b/perllib/FixMyStreet/TestAppProve.pm
@@ -40,8 +40,10 @@ sub spin_up_database {
$pg = Test::PostgreSQL->new(
run_psql_args => '-1Xq -v ON_ERROR_STOP=1', # No -b on 9.1
);
- $pg->run_psql_scripts('db/schema.sql'); # On 9.1, must create tables separately
- $pg->run_psql_scripts('db/fixture.sql', 'db/generate_secret.sql');
+ # On 9.1, must run each file separately
+ $pg->run_psql_scripts('db/schema.sql');
+ $pg->run_psql_scripts('db/fixture.sql');
+ $pg->run_psql_scripts('db/generate_secret.sql');
warn sprintf "# Connected to %s\n", $pg->dsn;