diff options
author | Nalin Dahyabhai <nalin@redhat.com> | 2012-04-03 12:01:57 -0400 |
---|---|---|
committer | Nalin Dahyabhai <nalin@redhat.com> | 2012-04-03 12:01:57 -0400 |
commit | 99b56fe001842549461a706f726e67785e20ae13 (patch) | |
tree | 120e14ca5c8d16fe9f25425b51201654a2b37854 /tests | |
parent | 6664dd61cdd64573daa371008b65dcdd646462e5 (diff) | |
parent | 5b2c5bd45124c6a9c109936dd1689a6b5a692716 (diff) | |
download | slapi-nis-99b56fe001842549461a706f726e67785e20ae13.tar.gz slapi-nis-99b56fe001842549461a706f726e67785e20ae13.tar.xz slapi-nis-99b56fe001842549461a706f726e67785e20ae13.zip |
Merge branch 'master' of git.fedorahosted.org:/git/slapi-nis
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/run-tests.sh | 2 | ||||
-rwxr-xr-x | tests/test23-schema-link/before.sh | 1 | ||||
-rw-r--r-- | tests/test23-schema-link/before.txt | 14 | ||||
-rw-r--r-- | tests/test23-schema-link/dse.ldif | 14 |
4 files changed, 30 insertions, 1 deletions
diff --git a/tests/run-tests.sh b/tests/run-tests.sh index c2d0eb5..a508755 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -34,6 +34,7 @@ for subdir in "$@" ; do fi startslapd $TESTDIR/$subdir/dse.ldif $TESTDIR/$subdir/userRoot.ldif "$precmd" if test -x $TESTDIR/$subdir/before.sh ; then + sleep 5 $TESTDIR/$subdir/before.sh > before.out 2>&1 if test -r $TESTDIR/$subdir/before.txt ; then if ! cmp -s $TESTDIR/$subdir/before.txt before.out ; then @@ -56,6 +57,7 @@ for subdir in "$@" ; do fi fi if test -x $TESTDIR/$subdir/after.sh ; then + sleep 5 $TESTDIR/$subdir/after.sh > after.out 2>&1 if test -r $TESTDIR/$subdir/after.txt ; then if ! cmp -s $TESTDIR/$subdir/after.txt after.out ; then diff --git a/tests/test23-schema-link/before.sh b/tests/test23-schema-link/before.sh index 4f0e0b7..7b1606b 100755 --- a/tests/test23-schema-link/before.sh +++ b/tests/test23-schema-link/before.sh @@ -1,2 +1,3 @@ #!/bin/sh search -b cn=compat,cn=accounts,dc=example,dc=com dn thingy | $LDIFSORT +search -b cn=compat2,cn=accounts,dc=example,dc=com dn thingy | $LDIFSORT diff --git a/tests/test23-schema-link/before.txt b/tests/test23-schema-link/before.txt index abd7230..81a0235 100644 --- a/tests/test23-schema-link/before.txt +++ b/tests/test23-schema-link/before.txt @@ -22,3 +22,17 @@ thingy: -,user1c,user1c,user1c|user1c thingy: -,-,user1c,user1c|user1c thingy: -,-,-,user1c|user1c +dn: cn=compat2,cn=accounts,dc=example,dc=com + +dn: cn=example,cn=compat2,cn=accounts,dc=example,dc=com + +dn: uid=group1-fake-uid,cn=example,cn=compat2,cn=accounts,dc=example,dc=com +thingy: -,group1-fake-uid,group1-fake-uid,group1-fake-uid +thingy: -,group1,group1-fake-uid,group1-fake-uid +thingy: -,group1,group1,group1-fake-uid + +dn: uid=group2-fake-uid,cn=example,cn=compat2,cn=accounts,dc=example,dc=com +thingy: -,group2-fake-uid,group2-fake-uid,group2-fake-uid +thingy: -,group2-alternate-name,group2-fake-uid,group2-fake-uid +thingy: -,group2,group2,group2-fake-uid + diff --git a/tests/test23-schema-link/dse.ldif b/tests/test23-schema-link/dse.ldif index a36146a..45b4bd3 100644 --- a/tests/test23-schema-link/dse.ldif +++ b/tests/test23-schema-link/dse.ldif @@ -1,4 +1,4 @@ -dn: cn=example,cn=Schema Compatibility,cn=plugins,cn=config +dn: cn=example+cn="compat,cn=Accounts,dc=example,dc=com",cn=Schema Compatibility,cn=plugins,cn=config objectClass: top objectClass: extensibleObject cn: example @@ -10,3 +10,15 @@ schema-compat-search-filter: (objectClass=posixAccount) schema-compat-entry-rdn: uid=%{uid} schema-compat-entry-attribute: thingy=%link("%{madeup}", "-", ",", "%merge(\":\",\"%{uid}\",\"%{madeup}\")", "-", ",", "%collect(\"%{uid}\",\"%{madeup}\",\"%{uid}\")", "-", ",", "%collect(\"%{madeup}\",\"%{uid}\",\"%{madeup}\",\"%{uid}\",\"%deref(\\\"madeup\\\",\\\"madeup\\\")\",\"%{uid}\")", "-")|%{uid} +dn: cn=example+cn="compat2,cn=Accounts,dc=example,dc=com",cn=Schema Compatibility,cn=plugins,cn=config +objectClass: top +objectClass: extensibleObject +cn: example +schema-compat-container-group: cn=compat2,cn=Accounts,dc=example,dc=com +schema-compat-container-rdn: cn=example +schema-compat-check-access: yes +schema-compat-search-base: cn=Groups1, cn=Accounts, dc=example, dc=com +schema-compat-search-filter: (objectClass=posixGroup) +schema-compat-entry-rdn: uid=%{uid} +schema-compat-entry-attribute: thingy=%link("%{madeup}", "-", ",", "%merge(\":\",\"%{uid}\",\"%{madeup}\")", "%{cn}", ",", "%collect(\"%{uid}\",\"%{madeup}\",\"%{uid}\")", "%{cn}", ",", "%collect(\"%{madeup}\",\"%{uid}\",\"%{madeup}\",\"%{uid}\",\"%deref(\\\"madeup\\\",\\\"madeup\\\")\",\"%{uid}\")", "-") + |