aboutsummaryrefslogtreecommitdiff
path: root/tests/server
diff options
context:
space:
mode:
authorRuss Allbery <rra@stanford.edu>2008-08-14 07:32:56 +0000
committerRuss Allbery <rra@stanford.edu>2008-08-14 07:32:56 +0000
commitb417f09ac51beeb618ecfdb74d81d91543d07848 (patch)
tree65298e28c2a1e74bff12861ad0bd7e1e9491672c /tests/server
parent4b1df0699a800411c106b96974eab52b737e2d60 (diff)
Fix logging in wallet-backend and the remctl configuration to not log
the data passed to store.
Diffstat (limited to 'tests/server')
-rw-r--r--tests/server/backend-t.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/server/backend-t.in b/tests/server/backend-t.in
index bc708f2..e1518d8 100644
--- a/tests/server/backend-t.in
+++ b/tests/server/backend-t.in
@@ -255,7 +255,7 @@ for my $command (sort keys %commands) {
($out, $err) = run_backend ($command, @args);
if ($command eq 'store' and $arg == 2) {
is ($err, '', 'Store allows any characters');
- is ($OUTPUT, "command $command @args from admin (1.2.3.4)"
+ is ($OUTPUT, "command $command @args[0,1] from admin (1.2.3.4)"
. " succeeded\n", ' and success logged');
is ($out, "$new\nstore foobar foobar foo;bar\n",
' and calls the right method');
@@ -327,7 +327,12 @@ for my $command (qw/autocreate create destroy setacl setattr store/) {
my @extra = ('foo') x ($commands{$command}[0] - 2);
my $extra = @extra ? join (' ', '', @extra) : '';
($out, $err) = run_backend ($command, 'type', 'name', @extra);
- my $ran = "$command type name" . (@extra ? " @extra" : '');
+ my $ran;
+ if ($command eq 'store') {
+ $ran = "$command type name";
+ } else {
+ $ran = "$command type name" . (@extra ? " @extra" : '');
+ }
is ($err, '', "Command $command ran with no errors");
is ($OUTPUT, "command $ran from admin (1.2.3.4) succeeded\n",
' and success logged');