summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin.dahyabhai@pobox.com>2009-05-07 18:28:12 -0400
committerNalin Dahyabhai <nalin.dahyabhai@pobox.com>2009-05-07 18:28:12 -0400
commit5e48debe2d515c2226492da8bb685101d509efff (patch)
treeb6da4bb9d806e5b23c2a7a36ded690a620d805e2
parent40e1fd41a2099a8947bafc0297ab7c207c97d103 (diff)
downloadslapi-nis-5e48debe2d515c2226492da8bb685101d509efff.tar.gz
slapi-nis-5e48debe2d515c2226492da8bb685101d509efff.tar.xz
slapi-nis-5e48debe2d515c2226492da8bb685101d509efff.zip
- more redundancy in the test
-rw-r--r--tests/test32-nis-empty/before.txt14
-rw-r--r--tests/test32-nis-empty/description.txt2
-rw-r--r--tests/test32-nis-empty/dse.ldif2
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/test32-nis-empty/before.txt b/tests/test32-nis-empty/before.txt
index 29ab04f..f87bfb0 100644
--- a/tests/test32-nis-empty/before.txt
+++ b/tests/test32-nis-empty/before.txt
@@ -18,10 +18,10 @@ user2a
user2b
user2c
contents of example.com:self:
-user1 user1,user1,user1
-user1a user1a,user1a,user1a
-user1b user1b,user1b,user1b
-user1c user1c,user1c,user1c
-user2a user2a,user2a,user2a
-user2b user2b,user2b,user2b
-user2c user2c,user2c,user2c
+user1 user1,user1,user1,user1
+user1a user1a,user1a,user1a,user1a
+user1b user1b,user1b,user1b,user1b
+user1c user1c,user1c,user1c,user1c
+user2a user2a,user2a,user2a,user2a
+user2b user2b,user2b,user2b,user2b
+user2c user2c,user2c,user2c,user2c
diff --git a/tests/test32-nis-empty/description.txt b/tests/test32-nis-empty/description.txt
index 795f1be..fda25ee 100644
--- a/tests/test32-nis-empty/description.txt
+++ b/tests/test32-nis-empty/description.txt
@@ -1 +1 @@
-deref() and referred() not returning empties
+deref()/referred()/merge()/collect() not returning empties
diff --git a/tests/test32-nis-empty/dse.ldif b/tests/test32-nis-empty/dse.ldif
index 21acc99..c8ce0dc 100644
--- a/tests/test32-nis-empty/dse.ldif
+++ b/tests/test32-nis-empty/dse.ldif
@@ -29,5 +29,5 @@ nis-base: cn=Users1, cn=Accounts, dc=example, dc=com
nis-base: cn=Users2, cn=Accounts, dc=example, dc=com
nis-filter: objectclass=posixAccount
nis-keys-format: %{uid}
-nis-values-format: %merge(",", "%{madeup}", "%collect(\"%{uid}\",\"%{madeup}\",\"%{uid}\",\"%deref(\\\"madeup\\\",\\\"madeup\\\")\",\"%{uid}\")")
+nis-values-format: %merge(",", "%{madeup}", "%collect(\"%{madeup}\")", "%collect(\"%{uid}\",\"%{madeup}\",\"%{uid}\",\"%deref(\\\"madeup\\\",\\\"madeup\\\")\",\"%{uid}\")", "%{uid}")