From 86b392acfe41422cca09563e27fed329af01d4ec Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Thu, 13 Mar 2008 16:24:16 +0000
Subject: [PATCH] New userpassword replace testcase + basic testsuite style pass
---
opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index 5ce19a9..4b5240e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -111,20 +111,6 @@
}
</call>
- <!-- Check some data was imported into Directory Server -->
- <call function="'checkImport'">
- { 'location' : masterHost,
- 'dsPath' : masterPath,
- 'dsHost' : masterHost,
- 'dsPort' : master.getPort(),
- 'dsDn' : master.getRootDn(),
- 'dsPswd' : master.getRootPwd(),
- 'expectedEntries' : ['uid=scarter,ou=People,o=example',
- 'uid=dmiller, ou=People, o=example',
- 'uid=rhunt, ou=People, o=example']
- }
- </call>
-
<!-- Start the Directory Server -->
<call function="'StartDsWithScript'">
{ 'location' : masterHost,
@@ -144,6 +130,21 @@
'noOfMilliSeconds' : 2000
}
</call>
+
+ <!-- Check some data was imported into Directory Server -->
+ <call function="'checkImport'">
+ { 'location' : masterHost,
+ 'dsPath' : masterPath,
+ 'dsHost' : masterHost,
+ 'dsPort' : master.getPort(),
+ 'dsDn' : master.getRootDn(),
+ 'dsPswd' : master.getRootPwd(),
+ 'expectedEntries' : ['uid=scarter,ou=People,o=example',
+ 'uid=dmiller, ou=People, o=example',
+ 'uid=rhunt, ou=People, o=example'],
+ 'startDS' : 'no'
+ }
+ </call>
<iterate var="server" in="consumerList">
@@ -199,8 +200,7 @@
'dsInstanceDn' : master.getRootDn(),
'dsInstancePswd' : master.getRootPwd(),
'DNToAdd' : 'uid=pmoriarty, ou=People, o=example',
- 'listAttributes' : listAttr,
- 'expectedRC' : 0
+ 'listAttributes' : listAttr
}
</call>
@@ -413,20 +413,6 @@
% masterDataDir
}
</call>
-
- <!-- Check some data was imported into Directory Server -->
- <call function="'checkImport'">
- { 'location' : masterHost,
- 'dsPath' : masterPath,
- 'dsHost' : masterHost,
- 'dsPort' : master.getPort(),
- 'dsDn' : master.getRootDn(),
- 'dsPswd' : master.getRootPwd(),
- 'expectedEntries' : ['uid=scarter,ou=People,o=example',
- 'uid=dmiller, ou=People, o=example',
- 'uid=sholmes, ou=People, o=example']
- }
- </call>
<!-- Start the Directory Server -->
<call function="'StartDsWithScript'">
@@ -447,6 +433,21 @@
'noOfMilliSeconds' : 2000
}
</call>
+
+ <!-- Check some data was imported into Directory Server -->
+ <call function="'checkImport'">
+ { 'location' : masterHost,
+ 'dsPath' : masterPath,
+ 'dsHost' : masterHost,
+ 'dsPort' : master.getPort(),
+ 'dsDn' : master.getRootDn(),
+ 'dsPswd' : master.getRootPwd(),
+ 'expectedEntries' : ['uid=scarter,ou=People,o=example',
+ 'uid=dmiller, ou=People, o=example',
+ 'uid=sholmes, ou=People, o=example'],
+ 'startDS' : 'no'
+ }
+ </call>
<!-- Perform the total update -->
@@ -501,8 +502,7 @@
'dsInstanceDn' : master.getRootDn(),
'dsInstancePswd' : master.getRootPwd(),
'DNToAdd' : 'uid=pmoriarty, ou=People, o=example',
- 'listAttributes' : listAttr,
- 'expectedRC' : 0
+ 'listAttributes' : listAttr
}
</call>
--
Gitblit v1.10.0