Cleaned up bitrot in nsswitch testsuite. Merged tests across from TNG

[tprouty/samba.git] / testsuite / nsswitch / finger.exp

diff --git a/testsuite/nsswitch/finger.exp b/testsuite/nsswitch/finger.exp
index 8a57f1c80961eab4a071e22b01f75fb85f8e544a..ab3b28f58fc46395d0208895ad995dd1883f380b 100644 (file)
--- a/testsuite/nsswitch/finger.exp
+++ b/testsuite/nsswitch/finger.exp
@@ -3,23 +3,37 @@
 #
 
 load_lib util-defs.exp
-load_lib "$srcdir/config/env.exp"
-load_lib "$srcdir/config/default-nt-names.exp"
 
-# Look up domain users using finger.  This should test getpwnam()
+set output [util_start "bin/wbinfo" "-u"]
+if { [regexp "Error" $output] } {
+    fail "error running wbinfo"
+    return
+}
+
+set user_list [split $output "\n"]
+
+# Look up all users using finger.  This should test getpwnam()
 
-foreach { user } $domain_users {
-    if {[util_test "finger" "-m $user" "" "no such user"] < 1} {
+foreach { user } $user_list {
+    set output [util_start "finger" "-m $user" "" "no such user"]
+    verbose $output
+
+    if { [regexp "no such user" $output] } {
         fail "finger -m $user"
     } else {
         pass "finger -m $user"
     }
 }
 
+verbose "testing finger -m"
+
 # Run finger without the -m to also test set/get/endpwent()
 
-foreach { user } $domain_users {
-    if {[util_test "finger" "$user" "" "no such user"] < 1} {
+foreach { user } $user_list {
+    set output [util_start "finger" "-m $user"]
+    verbose $output
+    
+    if { [regexp "no such user" $output] } {
         fail "finger $user"
     } else {
         pass "finger $user"