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/import.xml | 4 ++--
opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml | 8 +++++---
opends/tests/staf-tests/functional-tests/testcases/setup/security.xml | 5 +++--
opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml | 27 +++++++++++++++++++++++++++
opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml | 13 +++++++------
5 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
index e64e40eb..d47bec3 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
@@ -198,7 +198,7 @@
p = []
p.append('--cli --no-prompt --ldapPort %s' % (DM_I1_PORT))
p.append('--adminConnectorPort %s' % DM_I1_ADMIN_PORT)
- p.append('--rootUserPassword "kangourou"')
+ p.append('--rootUserPassword "kangourou" %s' % licenseOption)
p = ' '.join(p)
</script>
@@ -256,7 +256,8 @@
p = []
p.append('--cli --no-prompt --ldapPort %s' % (DM_I2_PORT))
p.append('--adminConnectorPort %s' % DM_I2_ADMIN_PORT)
- p.append('--rootUserDN "cn=DM" --rootUserPassword "kangourou"')
+ p.append('--rootUserDN "cn=DM" --rootUserPassword "kangourou" %s' \
+ % licenseOption)
p = ' '.join(p)
</script>
@@ -732,7 +733,8 @@
<script>
c = '%s/setup%s' % (DM_I3_ROOT, fileExt)
p = []
- p.append('--cli --no-prompt --rootUserDN "cn=DM" --quiet')
+ p.append('--cli --no-prompt --rootUserDN "cn=DM" --quiet %s' \
+ % licenseOption)
p.append('--rootUserPasswordFile %s' % DM_PASSWD_FILE)
p = ' '.join(p)
</script>
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 48dbf31..08d8c4a 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
@@ -164,7 +164,7 @@
p.append('--rootUserPassword "kangourou"')
p.append('--baseDN "o=o1"')
p.append('--baseDN "o=o2"')
- p.append('--sampleData 5')
+ p.append('--sampleData 5 %s' % licenseOption)
p = ' '.join(p)
</script>
@@ -347,7 +347,7 @@
p.append('--ldifFile %s' % IMP_LDIF_FILE)
p.append('--rejectFile %s' % IMP_REJECT_FILE)
p.append('--skipFile %s' % IMP_SKIP_FILE)
- p.append('--verbose')
+ p.append('--verbose %s' % licenseOption)
p = ' '.join(p)
</script>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
index a1e6303..a7f7542 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
@@ -143,7 +143,8 @@
<script>
c = '%s/setup%s' % (PORTS_I1_ROOT, fileExt)
p = []
- p.append('--cli --no-prompt --rootUserPassword kangourou')
+ p.append('--cli --no-prompt --rootUserPassword kangourou %s' \
+ % licenseOption)
p.append('--ldapPort %s' % PORTS_I1_PORT)
p.append('--adminConnectorPort %s' % PORTS_I1_ADMIN_PORT)
p = ' '.join(p)
@@ -187,7 +188,7 @@
c = '%s/%s/setup%s' % (ODS_UNZIPPED, OPENDSNAME, fileExt)
p = []
p.append('--cli --no-prompt --rootUserPassword kangourou')
- p.append('--ldapPort %s' % PORTS_I1_PORT)
+ p.append('--ldapPort %s %s' % (PORTS_I1_PORT, licenseOption))
p = ' '.join(p)
</script>
@@ -271,7 +272,7 @@
p.append('--cli --no-prompt --rootUserPassword kangourou')
p.append('--ldapPort %s' % PORTS_I2_PORT)
p.append('--ldapsPort %s' % PORTS_I1_PORT)
- p.append('--generateSelfSignedCertificate')
+ p.append('--generateSelfSignedCertificate %s' % licenseOption)
p = ' '.join(p)
</script>
@@ -353,7 +354,7 @@
p = []
p.append('--cli --no-prompt --rootUserPassword kangourou')
p.append('--ldapPort %s' % PORTS_I2_PORT)
- p.append('--jmxPort %s' % PORTS_I1_PORT)
+ p.append('--jmxPort %s %s' % (PORTS_I1_PORT, licenseOption))
p = ' '.join(p)
</script>
@@ -439,7 +440,7 @@
c = '%s/setup%s' % (PORTS_I2_ROOT, fileExt)
p = []
p.append('--cli --no-prompt --ldapPort %s' % PORTS_I1_PORT)
- p.append('--rootUserPassword "kangourou"')
+ p.append('--rootUserPassword "kangourou" %s' % licenseOption)
p.append('--skipPortCheck --doNotStart --noPropertiesFile')
p = ' '.join(p)
</script>
@@ -573,7 +574,7 @@
c = '%s/%s/setup%s' % (ODS_UNZIPPED, OPENDSNAME, fileExt)
p = []
p.append('--cli --no-prompt --rootUserPassword kangourou')
- p.append('--ldapPort 1')
+ p.append('--ldapPort 1 %s' % licenseOption)
p = ' '.join(p)
</script>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
index e53bb3c..49dde02 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
@@ -220,7 +220,7 @@
p.append('--adminConnectorPort %s' % SEC_I1_ADMIN_PORT)
p.append('--rootUserDN "%s"' % DM_DN)
p.append('--rootUserPassword "%s"' % DM_PW)
- p.append('--generateSelfSignedCertificate')
+ p.append('--generateSelfSignedCertificate %s' % licenseOption)
p = ' '.join(p)
</script>
@@ -359,7 +359,8 @@
p.append('--adminConnectorPort %s' % SEC_I2_ADMIN_PORT)
p.append('--rootUserDN "%s"' % DM_DN)
p.append('--rootUserPassword "%s"' % DM_PW)
- p.append('--generateSelfSignedCertificate --enableStartTLS')
+ p.append('--generateSelfSignedCertificate --enableStartTLS %s' \
+ % licenseOption)
p = ' '.join(p)
</script>
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