From c3f8af9928298eb90c9a5462475819fc77531d5e Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Sat, 29 Jun 2013 13:33:44 +0000
Subject: [PATCH] Backport: Fixed setup testsuite for 2.6.0
---
opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
index 854d11a..d321ca2 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
@@ -73,6 +73,33 @@
'arguments' : 'DIRECTORY %s FAILIFEXISTS' % ODS_UNZIPPED
}
</call>
+
+ <!-- Get the information about the server -->
+ <call function="'GetVar'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'type' : 'shared',
+ 'variable' : 'Job%s_ServerInfo' % STAXParentID
+ }
+ </call>
+ <if expr="RC != 0">
+ <script>
+ STAFResult='{}'
+ </script>
+ </if>
+ <script>
+ jobInfo=eval(STAFResult)
+ instPath = '%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)
+ if jobInfo.has_key(instPath):
+ serverInformation=jobInfo[instPath]
+ dsVersion=serverInformation['server version']
+ else:
+ dsVersion='unknown'
+
+ if dsVersion >= '2.5.0' and dsVersion != '2.5.0-Xpress1':
+ licenseOption = '--acceptLicense'
+ else:
+ licenseOption = ''
+ </script>
<script>
testList = []
--
Gitblit v1.10.0