Skip to content
Snippets Groups Projects
Commit e0df7582 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Rework test scripts to use single 'testrun' directory. 

Split glue test in two.
Remove (slurpd) subtree replication test.
Reorder syncrepl/proxy tests
parent 8b8383a8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 139 deletions
tests/Makefile.in
+ 1
− 1
View file @ e0df7582
......@@ -40,7 +40,7 @@ ldbm-yes ldbm-mod: FORCE
@$(RUN) -b ldbm all
clean-local: FORCE
-$(RM) -r test-db* test-repl* *leak *gmon *core
-$(RM) -r testrun *leak *gmon *core
veryclean-local: FORCE
@-$(RM) data schema ucdata
......
tests/data/slapd-acl.conf
+ 3
− 3
View file @ e0df7582
......@@ -8,8 +8,8 @@ include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
# global ACLs
access to dn.base="" attr=objectClass by users read
......@@ -25,7 +25,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
#ldbm#cachesize 0
suffix "o=University of Michigan,c=US"
directory ./test-db
directory ./testrun/db.1.a
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......
tests/data/slapd-cache-master.conf
+ 3
− 3
View file @ e0df7582
......@@ -8,8 +8,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -20,7 +20,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-db
directory ./testrun/db.1.a
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
index objectClass eq
......
tests/data/slapd-glue.conf
+ 5
− 5
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -22,7 +22,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "ou=Information Technology Division,ou=People,o=University of Michigan, c=US"
subordinate
directory ./test-db/C_db1
directory ./testrun/db.1.a
rootdn "cn=Manager, o=University of Michigan, c=US"
#ldbm#index objectclass eq
#ldbm#index uid pres,eq,sub
......@@ -36,7 +36,7 @@ rootdn "cn=Manager, o=University of Michigan, c=US"
database @BACKEND@
suffix "ou=Groups,o=University of Michigan, c=US"
subordinate
directory ./test-db/C_db2
directory ./testrun/db.1.b
rootdn "cn=Manager, o=University of Michigan, c=US"
#ldbm#index objectclass eq
#ldbm#index uid pres,eq,sub
......@@ -49,7 +49,7 @@ rootdn "cn=Manager, o=University of Michigan, c=US"
database @BACKEND@
suffix "o=University of Michigan, c=US"
directory ./test-db/C_db3
directory ./testrun/db.1.c
rootdn "cn=Manager, o=University of Michigan, c=US"
rootpw secret
#ldbm#index objectclass eq
......
tests/data/slapd-master.conf
+ 3
− 3
View file @ e0df7582
......@@ -8,8 +8,8 @@ include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -20,7 +20,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-db
directory ./testrun/db.1.a
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......
tests/data/slapd-proxycache.conf
+ 4
− 4
View file @ e0df7582
......@@ -8,8 +8,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
pidfile ./test-cache/slapd.pid
argsfile ./test-cache/slapd.args
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
access to * by write
......@@ -21,7 +21,7 @@ database @BACKEND@
suffix "o=University of Michigan,c=US,cn=cache"
cachesize 20
directory ./test-cache
directory ./testrun/db.2.a
index objectClass eq
index cn,sn,uid,mail pres,eq,sub
......@@ -36,7 +36,7 @@ rewriteRule "(.*)o=University of Michigan,c=US,cn=cache" "%1o=University of Mich
suffix "o=University of Michigan,c=US"
uri ldap://127.0.0.1:9009/o=University%20of%20Michigan,c=US
uri ldap://127.0.0.1:9011/o=University%20of%20Michigan,c=US
cacheparams 10000 15000 2 @ENTRY_LIMIT@ @CACHETTL@
attrset 0 sn cn title uid
......
tests/data/slapd-pw.conf
+ 3
− 3
View file @ e0df7582
......@@ -8,8 +8,8 @@ include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
# password-hash {md5}
......@@ -23,7 +23,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
#ldbm#cachesize 0
suffix "o=University of Michigan,c=US"
directory ./test-db
directory ./testrun/db.1.a
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
index objectClass eq
......
tests/data/slapd-ref-slave.conf
+ 4
− 4
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/slapd.pid
argsfile ./test-repl/slapd.args
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -19,12 +19,12 @@ modulepath ../servers/slapd/back-@BACKEND@/
# ldbm database definitions
#######################################################################
referral "ldap://localhost:9009/"
referral "ldap://localhost:9011/"
database @BACKEND@
cachesize 0
suffix "o=University of Mich,c=US"
directory ./test-repl
directory ./testrun/db.2.a
rootdn "cn=Manager,o=University of Mich,c=US"
rootpw secret
#ldbm#index objectClass eq
......
tests/data/slapd-referrals.conf
+ 3
− 3
View file @ e0df7582
......@@ -8,8 +8,8 @@ include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.pid
argsfile ./testrun/slapd.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -20,7 +20,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "c=US"
directory ./test-db
directory ./testrun/db.1.a
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......
tests/data/slapd-repl-master.conf
+ 5
− 5
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -22,7 +22,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
#ldbm#cachesize 0
suffix "o=University of Michigan,c=US"
directory ./test-db
directory ./testrun/db.1.a
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......@@ -30,9 +30,9 @@ rootpw secret
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
replogfile ./test-db/slapd.replog
replogfile ./testrun/slapd.1.replog
replica host=localhost:9010
replica host=localhost:9012
binddn="cn=Replica,o=University of Michigan,c=US"
bindmethod=simple
credentials=secret
tests/data/slapd-repl-slave.conf
+ 4
− 4
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/slapd.pid
argsfile ./test-repl/slapd.args
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -22,11 +22,11 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
#ldbm#cachesize 0
suffix "o=University of Michigan,c=US"
directory ./test-repl
directory ./testrun/db.2.a
rootdn "cn=Replica,o=University of Michigan,c=US"
rootpw secret
updatedn "cn=Replica,o=University of Michigan,c=US"
updateref "ldap://localhost:9009"
updateref "ldap://localhost:9010"
#ldbm#index objectClass eq
#ldbm#index cn,sn,uid pres,eq,sub
#bdb#index objectClass eq
......
tests/data/slapd-repl-submaster.conf deleted 100644 → 0
+ 0
− 40
View file @ 8b8383a8
# $OpenLDAP$
#
# master slapd config -- for testing of replication
#
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#######################################################################
# ldbm database definitions
#######################################################################
database @BACKEND@
#ldbm#cachesize 0
suffix "o=University of Michigan,c=US"
directory ./test-db
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
#ldbm#index cn,sn,uid pres,eq,sub
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
replogfile ./test-db/slapd.replog
replica host=localhost:9010
suffix="ou=Groups,o=University of Michigan,c=US"
attr!=description
binddn="cn=Replica,ou=Groups,o=University of Michigan,c=US"
bindmethod=simple
credentials=secret
tests/data/slapd-repl-subslave.conf deleted 100644 → 0
+ 0
− 33
View file @ 8b8383a8
# $OpenLDAP$
#
# slave slapd config -- for testing of replication
#
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/slapd.pid
argsfile ./test-repl/slapd.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#######################################################################
# ldbm database definitions
#######################################################################
database @BACKEND@
#ldbm#cachesize 0
suffix "ou=Groups, o=University of Michigan, c=US"
directory ./test-repl
rootdn "cn=Replica,ou=Groups,o=University of Michigan,c=US"
rootpw secret
updatedn "cn=Replica,ou=Groups,o=University of Michigan,c=US"
updateref "ldap://localhost:9009"
#ldbm#index objectClass eq
#ldbm#index cn,sn,uid pres,eq,sub
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
tests/data/slapd-schema.conf
+ 4
− 5
View file @ e0df7582
......@@ -11,15 +11,14 @@ include ./schema/cosine.schema
include ./schema/corba.schema
include ./schema/java.schema
include ./schema/inetorgperson.schema
#include ./schema/krb5-kdc.schema
include ./schema/misc.schema
include ./schema/nis.schema
include ./schema/openldap.schema
#
include ./schema/collective.schema
#
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
#
rootdse ./testdata/rootdse.ldif
......@@ -33,13 +32,13 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=OpenLDAP Project,l=Internet"
directory ./test-db
directory ./testrun/db.1.a
#ldbm#index objectClass eq
#bdb#index objectClass eq
#database @BACKEND@
#suffix "dc=example,dc=com"
#directory ./test-repl
#directory ./testrun/db.1.b
#index objectClass eq
#monitor#database monitor
tests/data/slapd-syncrepl-master.conf
+ 3
− 3
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -21,7 +21,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-db
directory ./testrun/db.1.a
rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......
tests/data/slapd-syncrepl-slave-persist1.conf
+ 4
− 4
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/p1/slapd.pid
argsfile ./test-repl/p1/slapd.args
pidfile ./testrun/slapd.4.pid
argsfile ./testrun/slapd.4.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -21,7 +21,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-repl/p1
directory ./testrun/db.4.a
rootdn "cn=Replica,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......@@ -31,7 +31,7 @@ rootpw secret
# Don't change syncrepl spec yet
syncrepl id=1
provider=ldap://localhost:9009
provider=ldap://localhost:9011
updatedn="cn=Replica,o=University of Michigan,c=US"
binddn="cn=Manager,o=University of Michigan,c=US"
bindmethod=simple
......
tests/data/slapd-syncrepl-slave-persist2.conf
+ 4
− 4
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/p2/slapd.pid
argsfile ./test-repl/p2/slapd.args
pidfile ./testrun/slapd.5.pid
argsfile ./testrun/slapd.5.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -21,7 +21,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-repl/p2
directory ./testrun/db.5.a
rootdn "cn=Replica,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......@@ -31,7 +31,7 @@ rootpw secret
# Don't change syncrepl spec yet
syncrepl id=1
provider=ldap://localhost:9013
provider=ldap://localhost:9014
updatedn="cn=Replica,o=University of Michigan,c=US"
binddn="cn=Replica,o=University of Michigan,c=US"
bindmethod=simple
......
tests/data/slapd-syncrepl-slave-persist3.conf
+ 4
− 4
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/p3/slapd.pid
argsfile ./test-repl/p3/slapd.args
pidfile ./testrun/slapd.6.pid
argsfile ./testrun/slapd.6.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -21,7 +21,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-repl/p3
directory ./testrun/db.6.a
rootdn "cn=Replica,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......@@ -31,7 +31,7 @@ rootpw secret
# Don't change syncrepl spec yet
syncrepl id=1
provider=ldap://localhost:9009
provider=ldap://localhost:9011
updatedn="cn=Replica,o=University of Michigan,c=US"
binddn="cn=Manager,o=University of Michigan,c=US"
bindmethod=simple
......
tests/data/slapd-syncrepl-slave-refresh1.conf
+ 4
− 4
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/r1/slapd.pid
argsfile ./test-repl/r1/slapd.args
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -21,7 +21,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-repl/r1
directory ./testrun/db.2.a
rootdn "cn=Replica,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......@@ -31,7 +31,7 @@ rootpw secret
# Don't change syncrepl spec yet
syncrepl id=1
provider=ldap://localhost:9009
provider=ldap://localhost:9011
updatedn="cn=Replica,o=University of Michigan,c=US"
binddn="cn=Manager,o=University of Michigan,c=US"
bindmethod=simple
......
tests/data/slapd-syncrepl-slave-refresh2.conf
+ 4
− 4
View file @ e0df7582
......@@ -9,8 +9,8 @@ include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
#
pidfile ./test-repl/r2/slapd.pid
argsfile ./test-repl/r2/slapd.args
pidfile ./testrun/slapd.3.pid
argsfile ./testrun/slapd.3.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
......@@ -21,7 +21,7 @@ modulepath ../servers/slapd/back-@BACKEND@/
database @BACKEND@
suffix "o=University of Michigan,c=US"
directory ./test-repl/r2
directory ./testrun/db.3.a
rootdn "cn=Replica,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
......@@ -31,7 +31,7 @@ rootpw secret
# Don't change syncrepl spec yet
syncrepl id=1
provider=ldap://localhost:9011
provider=ldap://localhost:9012
updatedn="cn=Replica,o=University of Michigan,c=US"
binddn="cn=Replica,o=University of Michigan,c=US"
bindmethod=simple
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment