From 036d84b6e8e7d8dd1aa25005b9ca426902b8292b Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 15 Oct 2008 16:31:28 +0000
Subject: [PATCH] Issue 3521 - backend name and suffix hardcode in some tests
---
opends/tests/staf-tests/functional-tests/testcases/backends/import.xml | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
index 3d9ece8..509d5bd 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
@@ -82,7 +82,8 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
- 'dsBackEnd' : 'userRoot'}
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
+ }
</call>
<call function="'checktestRC'">
@@ -204,7 +205,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeBranch' : ['dc=com'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -287,7 +288,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -332,7 +333,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -422,7 +423,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeAttribute' : ['dc'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -464,7 +465,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeAttribute' : ['dc','cn','ou','sn'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -507,7 +508,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeAttribute' : ['userpassword'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -549,7 +550,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeAttribute' : ['userpassword','mail','roomnumber'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -637,7 +638,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['objectclass=*'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -680,7 +681,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['objectclass=person'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -725,7 +726,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['objectclass=domain','objectclass=organizationalunit'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -770,7 +771,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['objectclass=person','objectclass=organizationalunit'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -812,7 +813,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -855,7 +856,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['&(objectclass=person)(ou=Departed)'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -940,7 +941,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Append.ldif' % remote.data,
'dsAppend' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -984,7 +985,7 @@
'dsLdifFile' : '%s/backends/Append.ldif' % remote.data,
'dsAppend' : 'TRUE',
'dsReplaceExisting' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1027,7 +1028,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif.gz' % remote.data,
'dsIsCompressed' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
<call function="'checktestRC'">
@@ -1069,7 +1070,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsIsEncrypted' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1134,7 +1135,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1177,7 +1178,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1220,7 +1221,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Schema.ldif' % remote.data,
'dsSkipSchemaValidation' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1262,7 +1263,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Schema.ldif' % remote.data,
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
--
Gitblit v1.10.0