[Pkg-shadow-commits] r3605 - in debian/trunk/tests/convtools: 20_pwunconv_usage_option 20_pwunconv_usage_option/data 22_grpunconv_usage_option 22_grpunconv_usage_option/data 25_pwconv_usage_option/data 26_grpconv_usage_option/data

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-14 19:45:13 +0000 (Mon, 14 Nov 2011)
New Revision: 3605

Modified:
   debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out
   debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test
   debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out
   debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test
   debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out
   debian/trunk/tests/convtools/26_grpconv_usage_option/data/usage.out
Log:
The pwconv, pwunconv, grpconv, and grpunconv utils now have complete usage
message and report a usage error if needed.


Modified: debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out	2011-11-14 19:43:28 UTC (rev 3604)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out	2011-11-14 19:45:13 UTC (rev 3605)
@@ -1 +1,7 @@
-Usage: pwunconv
+pwunconv: invalid option -- 'Z'
+Usage: pwunconv [options]
+
+Options:
+  -h, --help                    display this help message and exit
+  -R, --root CHROOT_DIR         directory to chroot into
+

Modified: debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test	2011-11-14 19:43:28 UTC (rev 3604)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test	2011-11-14 19:45:13 UTC (rev 3605)
@@ -23,7 +23,7 @@
 echo "OK"
 
 echo -n "Check returned status ($status)..."
-test "$status" = "1"
+test "$status" = "2"
 echo "OK"
 
 echo "pwunconv reported:"

Modified: debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out	2011-11-14 19:43:28 UTC (rev 3604)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out	2011-11-14 19:45:13 UTC (rev 3605)
@@ -1 +1,7 @@
-Usage: grpunconv
+grpunconv: invalid option -- 'Z'
+Usage: grpunconv [options]
+
+Options:
+  -h, --help                    display this help message and exit
+  -R, --root CHROOT_DIR         directory to chroot into
+

Modified: debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test	2011-11-14 19:43:28 UTC (rev 3604)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test	2011-11-14 19:45:13 UTC (rev 3605)
@@ -23,7 +23,7 @@
 echo "OK"
 
 echo -n "Check returned status ($status)..."
-test "$status" = "1"
+test "$status" = "2"
 echo "OK"
 
 echo "grpunconv reported:"

Modified: debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out
===================================================================
--- debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out	2011-11-14 19:43:28 UTC (rev 3604)
+++ debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out	2011-11-14 19:45:13 UTC (rev 3605)
@@ -1 +1,7 @@
-Usage: pwconv
+pwconv: invalid option -- 'Z'
+Usage: pwconv [options]
+
+Options:
+  -h, --help                    display this help message and exit
+  -R, --root CHROOT_DIR         directory to chroot into
+

Modified: debian/trunk/tests/convtools/26_grpconv_usage_option/data/usage.out
===================================================================
--- debian/trunk/tests/convtools/26_grpconv_usage_option/data/usage.out	2011-11-14 19:43:28 UTC (rev 3604)
+++ debian/trunk/tests/convtools/26_grpconv_usage_option/data/usage.out	2011-11-14 19:45:13 UTC (rev 3605)
@@ -1 +1,7 @@
-Usage: grpconv
+grpconv: invalid option -- 'Z'
+Usage: grpconv [options]
+
+Options:
+  -h, --help                    display this help message and exit
+  -R, --root CHROOT_DIR         directory to chroot into
+