On Sat, Oct 25, 2014 at 1:20 AM, Heikki Linnakangas
<hlinnakan...@vmware.com> wrote:
> Argh, looks like I forgot the actual code changes required.
> I just noticed that pg_controldata and pg_resetxlog don't check for extra
> arguments:
> $ pg_resetxlog data fds sdf sdf
> Transaction log reset
I think that it would be good to add as well a set of TAP tests for
all those things. So attached are two patches, one to complete the
tests of pg_controldata, and a second one to add TAP tests for
pg_resetxlog.
--
Michael
From b196d4159d7fce4f84222659a3b445c86cd2b5e8 Mon Sep 17 00:00:00 2001
From: Michael Paquier <mich...@otacoo.com>
Date: Sun, 26 Oct 2014 13:08:05 +0900
Subject: [PATCH 1/2] Add more TAP tests for pg_controldata
Those checks are related to extra arguments and the newly-introduced
option -D.
---
src/bin/pg_controldata/t/001_pg_controldata.pl | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/bin/pg_controldata/t/001_pg_controldata.pl b/src/bin/pg_controldata/t/001_pg_controldata.pl
index 35ad10a..f9cdcec 100644
--- a/src/bin/pg_controldata/t/001_pg_controldata.pl
+++ b/src/bin/pg_controldata/t/001_pg_controldata.pl
@@ -1,7 +1,7 @@
use strict;
use warnings;
use TestLib;
-use Test::More tests => 6;
+use Test::More tests => 10;
my $tempdir = TestLib::tempdir;
@@ -11,6 +11,14 @@ program_options_handling_ok('pg_controldata');
command_fails(['pg_controldata'], 'pg_controldata without arguments fails');
command_fails([ 'pg_controldata', 'nonexistent' ],
'pg_controldata with nonexistent directory fails');
+command_fails([ 'pg_controldata', 'arg1', 'arg2', 'arg3' ],
+ 'pg_controldata with too many arguments fails');
+command_fails([ 'pg_controldata', '-D' ],
+ 'pg_controldata -D with no directory defined fails');
+command_fails([ 'pg_controldata', '-D', 'arg1', 'arg2', 'arg3' ],
+ 'pg_controldata -D with too many arguments fails');
system_or_bail "initdb -D '$tempdir'/data -A trust >/dev/null";
command_like([ 'pg_controldata', "$tempdir/data" ],
qr/checkpoint/, 'pg_controldata produces output');
+command_like([ 'pg_controldata', "-D", "$tempdir/data" ],
+ qr/checkpoint/, 'pg_controldata produces output');
--
2.1.2
From 7d92cbfd0607fbf35902408e3a82bf2ca60bf71f Mon Sep 17 00:00:00 2001
From: Michael Paquier <mpaqu...@otacoo.com>
Date: Sat, 25 Oct 2014 08:14:37 +0000
Subject: [PATCH 2/2] Add TAP tests for pg_resetxlog
Those checks are related to extra arguments, the use of option -D with
a data directory as well as the generation of output for this utility.
---
src/bin/pg_resetxlog/.gitignore | 1 +
src/bin/pg_resetxlog/Makefile | 6 ++++++
src/bin/pg_resetxlog/t/001_pg_resetxlog.pl | 24 ++++++++++++++++++++++++
3 files changed, 31 insertions(+)
create mode 100644 src/bin/pg_resetxlog/t/001_pg_resetxlog.pl
diff --git a/src/bin/pg_resetxlog/.gitignore b/src/bin/pg_resetxlog/.gitignore
index 6b84208..68d8890 100644
--- a/src/bin/pg_resetxlog/.gitignore
+++ b/src/bin/pg_resetxlog/.gitignore
@@ -1 +1,2 @@
/pg_resetxlog
+/tmp_check/
diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile
index 6610690..5ebf8f4 100644
--- a/src/bin/pg_resetxlog/Makefile
+++ b/src/bin/pg_resetxlog/Makefile
@@ -33,3 +33,9 @@ uninstall:
clean distclean maintainer-clean:
rm -f pg_resetxlog$(X) $(OBJS)
+
+check: all
+ $(prove_check)
+
+installcheck:
+ $(prove_installcheck)
diff --git a/src/bin/pg_resetxlog/t/001_pg_resetxlog.pl b/src/bin/pg_resetxlog/t/001_pg_resetxlog.pl
new file mode 100644
index 0000000..4e6e0a7
--- /dev/null
+++ b/src/bin/pg_resetxlog/t/001_pg_resetxlog.pl
@@ -0,0 +1,24 @@
+use strict;
+use warnings;
+use TestLib;
+use Test::More tests => 10;
+
+my $tempdir = TestLib::tempdir;
+
+program_help_ok('pg_resetxlog');
+program_version_ok('pg_resetxlog');
+program_options_handling_ok('pg_resetxlog');
+command_fails(['pg_resetxlog'], 'pg_resetxlog without arguments fails');
+command_fails([ 'pg_resetxlog', 'nonexistent' ],
+ 'pg_resetxlog with nonexistent directory fails');
+command_fails([ 'pg_resetxlog', 'arg1', 'arg2', 'arg3' ],
+ 'pg_resetxlog with too many arguments fails');
+command_fails([ 'pg_resetxlog', '-D' ],
+ 'pg_resetxlog -D with no directory defined fails');
+command_fails([ 'pg_resetxlog', '-D', 'arg1', 'arg2', 'arg3' ],
+ 'pg_resetxlog -D with too many arguments fails');
+system_or_bail "initdb -D '$tempdir'/data -A trust >/dev/null";
+command_like([ 'pg_resetxlog', "$tempdir/data" ],
+ qr/Transaction/, 'pg_resetxlog produces output');
+command_like([ 'pg_resetxlog', "-D", "$tempdir/data" ],
+ qr/Transaction/, 'pg_resetxlog produces output');
--
2.1.2
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
