nss-pam-ldapd commit: r2117 - in debian/nss-pam-ldapd/trunk/debian: . patches

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

Author: arthur
Date: Wed Aug 20 22:22:31 2014
New Revision: 2117
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=2117&view=revision

Log:
use-ip-range-for-tests.patch: use a different IP range for running the 
autopkgtest tests to avoid conflicts in test environments

Added:
   debian/nss-pam-ldapd/trunk/debian/patches/
   debian/nss-pam-ldapd/trunk/debian/patches/series
   debian/nss-pam-ldapd/trunk/debian/patches/use-ip-range-for-tests.patch
Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Wed Jul 23 21:54:50 2014        
(r2116)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Wed Aug 20 22:22:31 2014        
(r2117)
@@ -1,3 +1,11 @@
+nss-pam-ldapd (0.9.4-3) UNRELEASED; urgency=medium
+
+  * NOT RELEASED YET
+  * use-ip-range-for-tests.patch: use a different IP range for running the
+    autopkgtest tests to avoid conflicts in test environments
+
+ -- Arthur de Jong <adejong@debian.org>  Wed, 20 Aug 2014 22:00:00 +0200
+
 nss-pam-ldapd (0.9.4-2) unstable; urgency=low
 
   * debconf translation updates:

Added: debian/nss-pam-ldapd/trunk/debian/patches/series
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ debian/nss-pam-ldapd/trunk/debian/patches/series    Wed Aug 20 22:22:31 
2014        (r2117)
@@ -0,0 +1 @@
+use-ip-range-for-tests.patch

Added: debian/nss-pam-ldapd/trunk/debian/patches/use-ip-range-for-tests.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ debian/nss-pam-ldapd/trunk/debian/patches/use-ip-range-for-tests.patch      
Wed Aug 20 22:22:31 2014        (r2117)
@@ -0,0 +1,95 @@
+Description: Use a different IP range for tests
+ This uses IP addresses from the RFC 5737 TEST-NET-1 range that is meant
+ for use in documentation. This avoids issues with running the tests
+ environments that also use the 10.0.0.0/8 range.
+Author: Arthur de Jong <arthur@arthurdejong.org>
+Origin: upstream, 
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=9516479505bcc750b1e52ff40a96720496d48f61
+
+--- a/tests/test.ldif
++++ b/tests/test.ldif
+@@ -40174,7 +40174,7 @@ objectClass: ieee802Device
+ objectClass: device
+ cn: testhost
+ cn: testhostalias
+-ipHostNumber: 10.0.0.1
++ipHostNumber: 192.0.2.123
+ macAddress: 0:18:8a:54:1a:8e
+ 
+ dn: cn=testhost2,ou=hosts,dc=test,dc=tld
+@@ -40193,7 +40193,7 @@ dn: cn=testnet,ou=networks,dc=test,dc=tl
+ objectClass: top
+ objectClass: ipNetwork
+ cn: testnet
+-ipNetworkNumber: 10.0.0.0
++ipNetworkNumber: 192.0.2.0
+ 
+ dn: ou=protocols,dc=test,dc=tld
+ objectClass: top
+--- a/tests/test_nsscmds.sh
++++ b/tests/test_nsscmds.sh
+@@ -120,7 +120,7 @@ EOM
+ 
+ # get entry by ip address
+ # this does not currently work, but maybe it should
+-#check "getent ethers 10.0.0.1" << EOM
++#check "getent ethers 192.0.2.123" << EOM
+ #0:18:8a:54:1a:8e testhost
+ #EOM
+ 
+@@ -229,24 +229,24 @@ then
+ echo "test_nsscmds.sh: testing hosts..."
+ 
+ check "getent hosts testhost" << EOM
+-10.0.0.1        testhost testhostalias
++192.0.2.123        testhost testhostalias
+ EOM
+ 
+ check "getent hosts testhostalias" << EOM
+-10.0.0.1        testhost testhostalias
++192.0.2.123        testhost testhostalias
+ EOM
+ 
+ # check hostname with different case
+ check "getent hosts TESTHOST" << EOM
+-10.0.0.1        testhost testhostalias
++192.0.2.123        testhost testhostalias
+ EOM
+ 
+-check "getent hosts 10.0.0.1" << EOM
+-10.0.0.1        testhost testhostalias
++check "getent hosts 192.0.2.123" << EOM
++192.0.2.123        testhost testhostalias
+ EOM
+ 
+ check "getent hosts | grep testhost" << EOM
+-10.0.0.1        testhost testhostalias
++192.0.2.123        testhost testhostalias
+ EOM
+ 
+ # TODO: add more tests for IPv6 support
+@@ -277,20 +277,20 @@ then
+ echo "test_nsscmds.sh: testing networks..."
+ 
+ check "getent networks testnet" << EOM
+-testnet               10.0.0.0
++testnet               192.0.2.0
+ EOM
+ 
+ # check network name with different case
+ check "getent networks TESTNET" << EOM
+-testnet               10.0.0.0
++testnet               192.0.2.0
+ EOM
+ 
+-check "getent networks 10.0.0.0" << EOM
+-testnet               10.0.0.0
++check "getent networks 192.0.2.0" << EOM
++testnet               192.0.2.0
+ EOM
+ 
+ check "getent networks | grep testnet" << EOM
+-testnet               10.0.0.0
++testnet               192.0.2.0
+ EOM
+ 
+ fi  # end of networks tests
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/