diff options
| author | Russ Allbery <rra@stanford.edu> | 2013-03-27 19:06:58 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2013-03-27 19:06:58 -0700 |
| commit | d9cd38432d82fc51d5cfcad3f071bf2193b4fdef (patch) | |
| tree | f68446ef9b0b175a7de9aca40110d106b87e50b6 | |
| parent | 999b027f10e81a3dfa3766ff4773e75e8ebbfb3f (diff) | |
| parent | 0069601d0dae535c2c0848a408bc5ecf349f7945 (diff) | |
Merge tag 'upstream/1.0' into debian
Upstream version 1.0
| -rwxr-xr-x | server/wallet-backend | 2 | ||||
| -rwxr-xr-x | tests/server/backend-t | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/server/wallet-backend b/server/wallet-backend index fc3434e..3c87709 100755 --- a/server/wallet-backend +++ b/server/wallet-backend @@ -195,7 +195,7 @@ sub command { print $status ? "yes\n" : "no\n"; } } elsif ($command eq 'comment') { - check_args (2, 3, [], @args); + check_args (2, 3, [3], @args); if (@args > 2) { $server->comment (@args) or failure ($server->error, @_); } else { diff --git a/tests/server/backend-t b/tests/server/backend-t index 50131b7..7e9287d 100755 --- a/tests/server/backend-t +++ b/tests/server/backend-t @@ -3,7 +3,7 @@ # Tests for the wallet-backend dispatch code. # # Written by Russ Allbery <rra@stanford.edu> -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 # The Board of Trustees of the Leland Stanford Junior University # # See LICENSE for licensing terms. @@ -283,11 +283,16 @@ for my $command (sort keys %commands) { my @args = @base; $args[$arg] = 'foo;bar'; ($out, $err) = run_backend ($command, @args); - if ($command eq 'store' and $arg == 2) { - is ($err, '', 'Store allows any characters'); - 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", + if (($command eq 'store' or $command eq 'comment') and $arg == 2) { + is ($err, '', 'Store and comment allow any characters'); + if ($command eq 'store') { + is ($OUTPUT, "command $command @args[0,1] from admin" + . " (1.2.3.4) succeeded\n", ' and success logged'); + } else { + is ($OUTPUT, "command $command @args from admin" + . " (1.2.3.4) succeeded\n", ' and success logged'); + } + is ($out, "$new\n$command foobar foobar foo;bar\n", ' and calls the right method'); } else { is ($err, "invalid characters in argument: foo;bar\n", |