From 4e7101fd2097719f302d0948d855f23fff6059f8 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 26 Oct 2009 15:18:37 +0000
Subject: [PATCH] Frontport of 2.2 tests to the trunk
---
opends/tests/staf-tests/functional-tests/testcases/setup/import.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
index c0145b7..cb69daa 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
@@ -68,8 +68,8 @@
'port' : 5544,
}
</call>
- <script>IMP_I1_ADMIN_PORT = STAXResult</script>
-
+ <script>IMP_I1_ADMIN_PORT = STAXResult</script>
+
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
@@ -496,9 +496,15 @@
<script>
if PRODUCTNAME.startswith('OpenDS'):
- expectedNb = 1
+ if is_windows_platform(STAF_REMOTE_HOSTNAME):
+ expectedNb = 2
+ else:
+ expectedNb = 1
else:
- expectedNb = 2
+ if is_windows_platform(STAF_REMOTE_HOSTNAME):
+ expectedNb = 3
+ else:
+ expectedNb = 2
</script>
<call function="'checktestRC'">
{ 'returncode' : nb,
@@ -507,12 +513,14 @@
}
</call>
+ <!--
<call function="'checktestRC'">
{ 'returncode' : ct,
'result' : a,
'expected' : 1
}
</call>
+ -->
<call function="'testCase_Postamble'"/>
--
Gitblit v1.10.0