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/shared/functions/webcontainer.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/webcontainer.xml b/opends/tests/staf-tests/shared/functions/webcontainer.xml
index e6b97bb..e6777a4 100755
--- a/opends/tests/staf-tests/shared/functions/webcontainer.xml
+++ b/opends/tests/staf-tests/shared/functions/webcontainer.xml
@@ -329,13 +329,21 @@
'%s' % STAFCmd
</message>
+ <!-- On Windows 2003, startup command return 1 and 2008 returns 0 -->
+ <script>
+ winVersion = is_windows_platform(location)
+ if winVersion and winVersion.find('2003') != -1:
+ expectedRC=1
+ else:
+ expectedRC=0
+ </script>
<call function="'runCommand'">
{ 'location' : location,
'command' : STAFCmd,
'envCmd' : STAFCmdEnv,
'name' : STAFCmd,
'path' : wcBinPath,
- 'expectedRC' : 0
+ 'expectedRC' : expectedRC
}
</call>
--
Gitblit v1.10.0