From: Peter Eisentraut Date: Sat, 13 Sep 2014 19:18:49 +0000 (-0400) Subject: pg_ctl: Add tests for behavior with nonexistent data directory X-Git-Tag: REL9_5_ALPHA1~1465 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=839acf9461deb0affb0dd710723cffeb72ffd82f;p=postgresql pg_ctl: Add tests for behavior with nonexistent data directory This behavior was made more precise in commit 11d205e2bd66cefe0b7d69c02e831cd055cbb5bb. --- diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl index 79f5db71b2..66ff06e3c4 100644 --- a/src/bin/pg_ctl/t/001_start_stop.pl +++ b/src/bin/pg_ctl/t/001_start_stop.pl @@ -1,7 +1,7 @@ use strict; use warnings; use TestLib; -use Test::More tests => 10; +use Test::More tests => 11; my $tempdir = TestLib::tempdir; my $tempdir_short = TestLib::tempdir_short; @@ -10,6 +10,9 @@ program_help_ok('pg_ctl'); program_version_ok('pg_ctl'); program_options_handling_ok('pg_ctl'); +command_exit_is([ 'pg_ctl', 'start', '-D', "$tempdir/nonexistent" ], + 1, 'pg_ctl start with nonexistent directory'); + command_ok([ 'pg_ctl', 'initdb', '-D', "$tempdir/data" ], 'pg_ctl initdb'); open CONF, ">>$tempdir/data/postgresql.conf"; print CONF "listen_addresses = ''\n"; diff --git a/src/bin/pg_ctl/t/002_status.pl b/src/bin/pg_ctl/t/002_status.pl index e10fd1b3e3..9502b6f7b2 100644 --- a/src/bin/pg_ctl/t/002_status.pl +++ b/src/bin/pg_ctl/t/002_status.pl @@ -1,11 +1,14 @@ use strict; use warnings; use TestLib; -use Test::More tests => 2; +use Test::More tests => 3; my $tempdir = TestLib::tempdir; my $tempdir_short = TestLib::tempdir_short; +command_exit_is([ 'pg_ctl', 'status', '-D', "$tempdir/nonexistent" ], + 4, 'pg_ctl status with nonexistent directory'); + system_or_bail "initdb -D '$tempdir'/data -A trust >/dev/null"; open CONF, ">>$tempdir/data/postgresql.conf"; print CONF "listen_addresses = ''\n";