nss-pam-ldapd commit: r1077 - nss-pam-ldapd/tests

["Commits of the nss-pam-ldapd project." <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Thu Apr  1 21:49:43 2010
New Revision: 1077
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1077

Log:
small improvements to the test setup

Modified:
   nss-pam-ldapd/tests/README
   nss-pam-ldapd/tests/test.ldif.gz
   nss-pam-ldapd/tests/test_nsscmds.sh

Modified: nss-pam-ldapd/tests/README
==============================================================================
--- nss-pam-ldapd/tests/README  Sat Mar 20 17:01:34 2010        (r1076)
+++ nss-pam-ldapd/tests/README  Thu Apr  1 21:49:43 2010        (r1077)
@@ -28,9 +28,9 @@
 
 The LDAP server should be set up to service up the dc=test,dc=tld DN as base.
 
-A sample test.ldif file is also available. Note that this file is currently
-not shipped in the released tarballs because it is quite large. Load the file
-into your LDAP server so that it can be served.
+A sample test.ldif file is also available in the SVN repository. Note that
+this file is currently not shipped in the released tarballs because it is
+quite large. Load the file into your LDAP server so that it can be served.
 
 Most of the names in the database have been randomly generated based on a
 combination of name-lists that were found on the Internet.

Modified: nss-pam-ldapd/tests/test.ldif.gz
==============================================================================
Binary file (source and/or target). No diff available.

Modified: nss-pam-ldapd/tests/test_nsscmds.sh
==============================================================================
--- nss-pam-ldapd/tests/test_nsscmds.sh Sat Mar 20 17:01:34 2010        (r1076)
+++ nss-pam-ldapd/tests/test_nsscmds.sh Thu Apr  1 21:49:43 2010        (r1077)
@@ -2,7 +2,7 @@
 
 # test.sh - simple test script to check output of name lookup commands
 #
-# Copyright (C) 2007, 2008, 2009 Arthur de Jong
+# Copyright (C) 2007, 2008, 2009, 2010 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,11 +20,9 @@
 # 02110-1301 USA
 
 # This script expects to be run in an environment where nss-pam-ldapd
-# is deployed with an LDAP server with the proper contents (nslcd running).
-# FIXME: update the above description and provide actual LDIF file
-# It's probably best to run this in an environment without nscd.
-
-# note that nscd should not be running (breaks services test)
+# is deployed with an LDAP server with the proper content (and nslcd running).
+# It's probably best to run this in an environment without nscd (this breaks
+# the services tests).
 
 set -e
 
@@ -92,6 +90,8 @@
 
 echo "test_nsscmds.sh: testing aliases..."
 
+# note that this doesn't work if /etc/aliases contains anything
+
 # check all aliases
 check "getent aliases|sort" << EOM
 bar2:           foobar@example.com
@@ -230,11 +230,6 @@
 10.0.0.1        testhost testhostalias
 EOM
 
-# dummy test for IPv6 envoronment
-check "getent hosts ::1" << EOM
-::1             ip6-localhost ip6-loopback
-EOM
-
 # TODO: add more tests for IPv6 support
 
 ###########################################################################
@@ -303,11 +298,11 @@
 echo "test_nsscmds.sh: testing protocols..."
 
 check "getent protocols protfoo" << EOM
-protfoo               140 protfooalias
+protfoo               253 protfooalias
 EOM
 
 check "getent protocols protfooalias" << EOM
-protfoo               140 protfooalias
+protfoo               253 protfooalias
 EOM
 
 # check protocol with different case
@@ -318,8 +313,8 @@
 check "getent protocols PROTFOOALIAS" << EOM
 EOM
 
-check "getent protocols 140" << EOM
-protfoo               140 protfooalias
+check "getent protocols 253" << EOM
+protfoo               253 protfooalias
 EOM
 
 check "getent protocols icmp" << EOM
@@ -327,7 +322,7 @@
 EOM
 
 check "getent protocols | grep protfoo" << EOM
-protfoo               140 protfooalias
+protfoo               253 protfooalias
 EOM
 
 ###########################################################################
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits