The following commit has been merged in the master branch:
commit 9305742ea75ee9b1fd58abf68c081b72692d3632
Author: Guillem Jover <[email protected]>
Date: Sat Mar 31 20:29:09 2012 +0200
dpkg-divert: Use call_divert_badusage() to test for single arguments
diff --git a/src/t/100_dpkg_divert.t b/src/t/100_dpkg_divert.t
index 8d0e991..93f97ad 100644
--- a/src/t/100_dpkg_divert.t
+++ b/src/t/100_dpkg_divert.t
@@ -33,7 +33,7 @@ if (! -x "@dd") {
exit(0);
}
-plan tests => 237;
+plan tests => 239;
sub cleanup {
system("rm -rf $tmpdir && mkdir -p $testdir");
@@ -151,6 +151,8 @@ call_divert_badusage(['--add', "/foo\nbar"], qr/newline/);
call_divert_badusage(['--add', "$testdir"], qr/director(y|ies)/);
call_divert_badusage(['--add', "--divert", "bar", "/foo/bar"], qr/absolute/);
call_divert_badusage(['--remove'], qr/needs a single argument/);
+call_divert_badusage(['--listpackage'], qr/needs a single argument/);
+call_divert_badusage(['--truename'], qr/needs a single argument/);
call([@dd, '--admindir'], [],
expect_failure => 1, expect_stderr_like => qr/(takes a
value|needs.*argument)/);
@@ -213,13 +215,11 @@ dash
:
EOF
-call_divert(['--listpackage'], expect_failure => 1);
call_divert(['--listpackage', 'foo', 'bar'], expect_failure => 1);
call_divert(['--listpackage', '/bin/sh'], expect_stdout => "dash\n",
expect_stderr => '');
call_divert(['--listpackage', '/bin/true'], expect_stdout => "LOCAL\n",
expect_stderr => '');
call_divert(['--listpackage', '/bin/false'], expect_stdout => '',
expect_stderr => '');
-call_divert(['--truename'], expect_failure => 1);
call_divert(['--truename', '/bin/sh'], expect_stdout => "/bin/sh.distrib\n",
expect_stderr => '');
call_divert(['--truename', '/bin/sh.distrib'], expect_stdout =>
"/bin/sh.distrib\n", expect_stderr => '');
call_divert(['--truename', '/bin/something'], expect_stdout =>
"/bin/something\n", expect_stderr => '');
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
