From d984dcb999f8e4f5eac6138f5fdde064f935468d Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Mon, 14 Nov 2011 20:42:35 +0000
Subject: [PATCH] Fix test.

---
 tests/newusers/58_invalid_input_file/data/newusers.err | 2 ++
 tests/newusers/58_invalid_input_file/data/usage.out    | 7 -------
 tests/newusers/58_invalid_input_file/newusers.test     | 8 ++++----
 3 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 tests/newusers/58_invalid_input_file/data/newusers.err
 delete mode 100644 tests/newusers/58_invalid_input_file/data/usage.out

diff --git a/tests/newusers/58_invalid_input_file/data/newusers.err b/tests/newusers/58_invalid_input_file/data/newusers.err
new file mode 100644
index 00000000..fe15bdcb
--- /dev/null
+++ b/tests/newusers/58_invalid_input_file/data/newusers.err
@@ -0,0 +1,2 @@
+newusers: line 1: invalid line
+newusers: error detected, changes ignored
diff --git a/tests/newusers/58_invalid_input_file/data/usage.out b/tests/newusers/58_invalid_input_file/data/usage.out
deleted file mode 100644
index 99864b50..00000000
--- a/tests/newusers/58_invalid_input_file/data/usage.out
+++ /dev/null
@@ -1,7 +0,0 @@
-newusers: invalid option -- 'Z'
-Usage: newusers [options]
-
-Options:
-  -h, --help                    display this help message and exit
-  -r, --system                  create system accounts
-
diff --git a/tests/newusers/58_invalid_input_file/newusers.test b/tests/newusers/58_invalid_input_file/newusers.test
index ed4ac7c9..b4f78899 100755
--- a/tests/newusers/58_invalid_input_file/newusers.test
+++ b/tests/newusers/58_invalid_input_file/newusers.test
@@ -17,7 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 change_config
 
 echo -n "Call newusers with invalid input (newusers data/newusers.list)..."
-newusers data/newusers.list 2>tmp/usage.out && exit 1 || {
+newusers data/newusers.list 2>tmp/newusers.err && exit 1 || {
 	status=$?
 }
 echo "OK"
@@ -28,12 +28,12 @@ echo "OK"
 
 echo "newusers reported:"
 echo "======================================================================="
-cat tmp/usage.out
+cat tmp/newusers.err
 echo "======================================================================="
 echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
+diff -au data/newusers.err tmp/newusers.err
 echo "usage message OK."
-rm -f tmp/usage.out
+rm -f tmp/newusers.err
 
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd