diff options
author | Simo Sorce <idra@samba.org> | 2005-01-19 22:56:14 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:00 -0500 |
commit | bc2ae4e4cd96311a028486cac78960142e9b41c5 (patch) | |
tree | ef809738c20320818696fc83acde4dd918c88fb8 /source4/lib/ldb/tests | |
parent | 23f92c16349a3142012e54afc3854c469f32a165 (diff) | |
download | samba-bc2ae4e4cd96311a028486cac78960142e9b41c5.tar.gz samba-bc2ae4e4cd96311a028486cac78960142e9b41c5.tar.bz2 samba-bc2ae4e4cd96311a028486cac78960142e9b41c5.zip |
r4862: - better structure schema tests
- fix check for deletion of required attributes on modify
removed by mistake with the previous commits
(This used to be commit 0315159daf157b64ef3452372dd74199600e24b8)
Diffstat (limited to 'source4/lib/ldb/tests')
-rw-r--r-- | source4/lib/ldb/tests/schema-mod-test.ldif | 25 | ||||
-rw-r--r-- | source4/lib/ldb/tests/schema-tests/schema-add-test.ldif (renamed from source4/lib/ldb/tests/schema-add-test.ldif) | 0 | ||||
-rw-r--r-- | source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif | 5 | ||||
-rw-r--r-- | source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif | 5 | ||||
-rw-r--r-- | source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif | 5 | ||||
-rw-r--r-- | source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif | 5 | ||||
-rw-r--r-- | source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif | 5 | ||||
-rw-r--r-- | source4/lib/ldb/tests/schema-tests/schema.ldif (renamed from source4/lib/ldb/tests/schema.ldif) | 0 | ||||
-rwxr-xr-x | source4/lib/ldb/tests/test-schema.sh | 19 |
9 files changed, 41 insertions, 28 deletions
diff --git a/source4/lib/ldb/tests/schema-mod-test.ldif b/source4/lib/ldb/tests/schema-mod-test.ldif deleted file mode 100644 index 8e36de7bf5..0000000000 --- a/source4/lib/ldb/tests/schema-mod-test.ldif +++ /dev/null @@ -1,25 +0,0 @@ -dn: CN=Test,CN=Users,DC=schema,DC=test -changetype: modify -replace: description -description: this test must not fail - -dn: CN=Test,CN=Users,DC=schema,DC=test -changetype: modify -delete: description -# this test must not fail - -dn: CN=Test,CN=Users,DC=schema,DC=test -changetype: modify -add: description -description: this test must not fail - -dn: CN=Test,CN=Users,DC=schema,DC=test -changetype: modify -add: foo -foo: this test must fail - -dn: CN=Test,CN=Users,DC=schema,DC=test -changetype: modify -delete: nTSecurityDescriptor -# this test must fail - diff --git a/source4/lib/ldb/tests/schema-add-test.ldif b/source4/lib/ldb/tests/schema-tests/schema-add-test.ldif index 997b801d84..997b801d84 100644 --- a/source4/lib/ldb/tests/schema-add-test.ldif +++ b/source4/lib/ldb/tests/schema-tests/schema-add-test.ldif diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif b/source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif new file mode 100644 index 0000000000..b976724485 --- /dev/null +++ b/source4/lib/ldb/tests/schema-tests/schema-mod-test-1.ldif @@ -0,0 +1,5 @@ +dn: CN=Test,CN=Users,DC=schema,DC=test +changetype: modify +replace: description +description: this test must not fail + diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif b/source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif new file mode 100644 index 0000000000..fa193af683 --- /dev/null +++ b/source4/lib/ldb/tests/schema-tests/schema-mod-test-2.ldif @@ -0,0 +1,5 @@ +dn: CN=Test,CN=Users,DC=schema,DC=test +changetype: modify +delete: description +# this test must not fail + diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif b/source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif new file mode 100644 index 0000000000..8ab7798f9c --- /dev/null +++ b/source4/lib/ldb/tests/schema-tests/schema-mod-test-3.ldif @@ -0,0 +1,5 @@ +dn: CN=Test,CN=Users,DC=schema,DC=test +changetype: modify +add: description +description: this test must not fail + diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif b/source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif new file mode 100644 index 0000000000..cbf0e60bbe --- /dev/null +++ b/source4/lib/ldb/tests/schema-tests/schema-mod-test-4.ldif @@ -0,0 +1,5 @@ +dn: CN=Test,CN=Users,DC=schema,DC=test +changetype: modify +add: foo +foo: this test must fail + diff --git a/source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif b/source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif new file mode 100644 index 0000000000..bc64e9edb6 --- /dev/null +++ b/source4/lib/ldb/tests/schema-tests/schema-mod-test-5.ldif @@ -0,0 +1,5 @@ +dn: CN=Test,CN=Users,DC=schema,DC=test +changetype: modify +delete: nTSecurityDescriptor +# this test must fail + diff --git a/source4/lib/ldb/tests/schema.ldif b/source4/lib/ldb/tests/schema-tests/schema.ldif index 2661ae30c5..2661ae30c5 100644 --- a/source4/lib/ldb/tests/schema.ldif +++ b/source4/lib/ldb/tests/schema-tests/schema.ldif diff --git a/source4/lib/ldb/tests/test-schema.sh b/source4/lib/ldb/tests/test-schema.sh index 5423c7eff9..08595a0a9c 100755 --- a/source4/lib/ldb/tests/test-schema.sh +++ b/source4/lib/ldb/tests/test-schema.sh @@ -7,13 +7,26 @@ rm -f schema.ldb echo "LDB_URL: $LDB_URL" echo "Adding schema" -$VALGRIND bin/ldbadd tests/schema.ldif || exit 1 +$VALGRIND bin/ldbadd tests/schema-tests/schema.ldif || exit 1 echo "Adding few test elements (no failure expected here)" -$VALGRIND bin/ldbadd tests/schema-add-test.ldif || exit 1 +$VALGRIND bin/ldbadd tests/schema-tests/schema-add-test.ldif || exit 1 echo "Modifying elements (2 failures expected here)" -$VALGRIND bin/ldbmodify tests/schema-mod-test.ldif + +$VALGRIND bin/ldbmodify tests/schema-tests/schema-mod-test-1.ldif || exit 1 +$VALGRIND bin/ldbmodify tests/schema-tests/schema-mod-test-2.ldif || exit 1 +$VALGRIND bin/ldbmodify tests/schema-tests/schema-mod-test-3.ldif || exit 1 +$VALGRIND bin/ldbmodify tests/schema-tests/schema-mod-test-4.ldif +if [ "$?" == "0" ]; then + echo "test failed!" + exit 1 +fi +$VALGRIND bin/ldbmodify tests/schema-tests/schema-mod-test-5.ldif +if [ "$?" == "0" ]; then + echo "test failed!" + exit 1 +fi echo "Showing modified record" $VALGRIND bin/ldbsearch '(cn=Test)' || exit 1 |