diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-11 21:16:47 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-11 21:16:47 -0500 |
| commit | 8ddfa26303a6719f4e567546e337283f69ff813c (patch) | |
| tree | 157a0dc63f6d1a4ec33da8ad7d17a0c2cd01f1be /tests | |
| parent | 170146d798bf2ba3429da55bfc952ad91bf47619 (diff) | |
| download | slapi-nis-8ddfa26303a6719f4e567546e337283f69ff813c.tar.gz slapi-nis-8ddfa26303a6719f4e567546e337283f69ff813c.tar.xz slapi-nis-8ddfa26303a6719f4e567546e337283f69ff813c.zip | |
- fix the test that we do recompute the two entries when we're not skipping that
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/run-tests.sh | 12 | ||||
| -rwxr-xr-x | tests/test29-schema-modify-entry/after.sh | 2 | ||||
| -rw-r--r-- | tests/test29-schema-modify-entry/after.txt | 13 | ||||
| -rw-r--r-- | tests/test29-schema-modify-entry/before.txt | 13 | ||||
| -rwxr-xr-x | tests/test29-schema-modify-entry/change.sh | 4 | ||||
| -rw-r--r-- | tests/test29-schema-modify-entry/change.txt | 2 | ||||
| -rwxr-xr-x | tests/test29-schema-modify-entry/post.sh | 3 |
7 files changed, 19 insertions, 30 deletions
diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 904613a..c2d0eb5 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -66,6 +66,18 @@ for subdir in "$@" ; do fi fi fi + if ! test -r $TESTDIR/$subdir/before.txt ; then + if ! test -r $TESTDIR/$subdir/after.txt ; then + if test -x $TESTDIR/$subdir/post.sh ; then + if ! $TESTDIR/$subdir/post.sh $TESTDIR/$subdir/before.out $TESTDIR/$subdir/after.out ; then + echo `basename "$subdir"`: + showdiff $TESTDIR/$subdir/before.out after.out + stopslapd + exit 1 + fi + fi + fi + fi stopslapd popd > /dev/null if test -s $TESTDIR/$subdir/description.txt ; then diff --git a/tests/test29-schema-modify-entry/after.sh b/tests/test29-schema-modify-entry/after.sh index a8a0114..3b25499 100755 --- a/tests/test29-schema-modify-entry/after.sh +++ b/tests/test29-schema-modify-entry/after.sh @@ -1,2 +1,2 @@ #!/bin/sh -search -b cn=compat,cn=accounts,dc=example,dc=com dn memberUid sequence | $LDIFSORT | sed -e 's,^sequence: 1$,sequence: unchanged,g' -e 's,^sequence: 2$,sequence: unchanged,g' | sed -e 's,^sequence: [0-9].*$,sequence: CHANGED,g' +search -b cn=compat,cn=accounts,dc=example,dc=com dn memberUid sequence | $LDIFSORT diff --git a/tests/test29-schema-modify-entry/after.txt b/tests/test29-schema-modify-entry/after.txt deleted file mode 100644 index 68a7864..0000000 --- a/tests/test29-schema-modify-entry/after.txt +++ /dev/null @@ -1,13 +0,0 @@ -dn: cn=compat,cn=accounts,dc=example,dc=com - -dn: cn=g1,ou=group,cn=compat,cn=accounts,dc=example,dc=com -memberUid: tuser1 -sequence: CHANGED - -dn: cn=g2,ou=group,cn=compat,cn=accounts,dc=example,dc=com -memberUid: tuser2 -memberUid: tuser1 -sequence: CHANGED - -dn: ou=group,cn=compat,cn=accounts,dc=example,dc=com - diff --git a/tests/test29-schema-modify-entry/before.txt b/tests/test29-schema-modify-entry/before.txt deleted file mode 100644 index 2b2f173..0000000 --- a/tests/test29-schema-modify-entry/before.txt +++ /dev/null @@ -1,13 +0,0 @@ -dn: cn=compat,cn=accounts,dc=example,dc=com - -dn: cn=g1,ou=group,cn=compat,cn=accounts,dc=example,dc=com -memberUid: tuser1 -sequence: 1 - -dn: cn=g2,ou=group,cn=compat,cn=accounts,dc=example,dc=com -memberUid: tuser2 -memberUid: tuser1 -sequence: 2 - -dn: ou=group,cn=compat,cn=accounts,dc=example,dc=com - diff --git a/tests/test29-schema-modify-entry/change.sh b/tests/test29-schema-modify-entry/change.sh index 6a9264c..26fee20 100755 --- a/tests/test29-schema-modify-entry/change.sh +++ b/tests/test29-schema-modify-entry/change.sh @@ -1,9 +1,9 @@ #!/bin/sh modify << EOF -dn: cn=g2,cn=groups,cn=accounts,dc=example,dc=com +dn: cn=g1,cn=groups,cn=accounts,dc=example,dc=com changetype: modify replace: gidNumber -gidNumber: 2002 +gidNumber: 2001 - EOF diff --git a/tests/test29-schema-modify-entry/change.txt b/tests/test29-schema-modify-entry/change.txt index f8ae3a0..5dd828a 100644 --- a/tests/test29-schema-modify-entry/change.txt +++ b/tests/test29-schema-modify-entry/change.txt @@ -1,2 +1,2 @@ -modifying entry "cn=g2,cn=groups,cn=accounts,dc=example,dc=com" +modifying entry "cn=g1,cn=groups,cn=accounts,dc=example,dc=com" diff --git a/tests/test29-schema-modify-entry/post.sh b/tests/test29-schema-modify-entry/post.sh new file mode 100755 index 0000000..d29e839 --- /dev/null +++ b/tests/test29-schema-modify-entry/post.sh @@ -0,0 +1,3 @@ +#!/bin/sh +test `diff -u "$1" "$2" | grep ^-sequence: | wc -l` -eq 2 && \ +test `diff -u "$1" "$2" | grep ^+sequence: | wc -l` -eq 2 |