From dfa9f9347d1d015bf16146c368eec6f6ab6c1b4e Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Sun, 21 Oct 2012 15:28:35 +0000
Subject: [PATCH] More changes of OpenDS to OpenDJ in functional tests
---
opends/tests/staf-tests/shared/ant/tests.xml | 2 +-
opends/tests/staf-tests/shared/tests/runTestJob.xml | 2 +-
opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml | 20 ++++++++++----------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
index 3454050..7975205 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
@@ -31,7 +31,7 @@
#@TestMarker Backend Backup Tests
#@TestName Backup: Backup 001
#@TestID Backup 001
- #@TestPurpose Backup the data in OpenDS.
+ #@TestPurpose Backup the data in OpenDJ.
#@TestPreamble
#@TestSteps Client calls backup with the parameters
default backendID, and backupDirectory
@@ -47,7 +47,7 @@
<call function="'testCase_Preamble'"/>
<message>
- 'Backend Backup 001: Create a backup of the data in OpenDS'
+ 'Backend Backup 001: Create a backup of the data in OpenDJ'
</message>
<call function="'backup'">
@@ -73,7 +73,7 @@
#@TestMarker Backend Backup Tests
#@TestName Backup: Backup 002
#@TestID Backup 002
- #@TestPurpose Create an incremental backup of the data in OpenDS.
+ #@TestPurpose Create an incremental backup of the data in OpenDJ.
#@TestPreamble
#@TestSteps Client calls backup with the parameters
default backendID, backupDir, and incremental
@@ -86,7 +86,7 @@
<sequence>
<call function="'testCase_Preamble'"/>
<message>
- 'Backend Backup 002 Create an incremental backup of the data in OpenDS'
+ 'Backend Backup 002 Create an incremental backup of the data in OpenDJ'
</message>
<call function="'backup'">
{ 'backupDir' : '%s/backends/backup1' % remote.temp,
@@ -113,7 +113,7 @@
#@TestMarker Backend Backup Tests
#@TestName Backup: Backup 003
#@TestID Backup 003
- #@TestPurpose Create a backup of the data in OpenDS with a backup id.
+ #@TestPurpose Create a backup of the data in OpenDJ with a backup id.
#@TestPreamble
#@TestSteps Client calls backup with the parameters
default backendID, backupDir, and backupID
@@ -126,7 +126,7 @@
<sequence>
<call function="'testCase_Preamble'"/>
<message>
- 'Backend Backup 003: Create a backup of the data in OpenDS with a backup id'
+ 'Backend Backup 003: Create a backup of the data in OpenDJ with a backup id'
</message>
<call function="'backup'">
@@ -155,7 +155,7 @@
#@TestMarker Backend Backup Tests
#@TestName Backup: Backup 004
#@TestID Backup 004
- #@TestPurpose Create an incremental backup of the data in OpenDS with a backup id.
+ #@TestPurpose Create an incremental backup of the data in OpenDJ with a backup id.
#@TestPreamble
#@TestSteps Client calls backup with the parameters
default backendID, backupDir, incremental, and backupID
@@ -168,7 +168,7 @@
<sequence>
<call function="'testCase_Preamble'" />
<message>
- 'Backend Backup 004: Create an incremental backup of the data in OpenDS with a backup id'
+ 'Backend Backup 004: Create an incremental backup of the data in OpenDJ with a backup id'
</message>
<call function="'backup'">
{ 'backupDir' : '%s/backends/backup2' % remote.temp,
@@ -197,7 +197,7 @@
#@TestMarker Backend Backup Tests
#@TestName Backup: Backup 005
#@TestID Backup 005
- #@TestPurpose Create a compressed backup of the data in OpenDS.
+ #@TestPurpose Create a compressed backup of the data in OpenDJ.
#@TestPreamble
#@TestSteps Client calls backup with the parameters
default backendID, backupDir, and compress
@@ -210,7 +210,7 @@
<sequence>
<call function="'testCase_Preamble'"/>
<message>
- 'Backend Backup 005: Create a compressed backup of the data in OpenDS'
+ 'Backend Backup 005: Create a compressed backup of the data in OpenDJ'
</message>
<call function="'backup'">
{ 'backupDir' : '%s/backends/backup1' % remote.temp,
diff --git a/opends/tests/staf-tests/shared/ant/tests.xml b/opends/tests/staf-tests/shared/ant/tests.xml
index 04da670..16eb5b7 100644
--- a/opends/tests/staf-tests/shared/ant/tests.xml
+++ b/opends/tests/staf-tests/shared/ant/tests.xml
@@ -109,7 +109,7 @@
separator by a forward slash. Staf otherwise fails to find the files. -->
<replace file="${tests.run.dir}/${tests.run.time}/config/${tests.config.file}" token="\" value="/"/>
- <property name="tests.request" value="EXECUTE FILE ${tests.xml} JOBNAME OpenDS_${tests.type} SCRIPTFILE ${tests.run.dir}/${tests.run.time}/config/${tests.config.file} WAIT CLEARLOGS"/>
+ <property name="tests.request" value="EXECUTE FILE ${tests.xml} JOBNAME OpenDJ_${tests.type} SCRIPTFILE ${tests.run.dir}/${tests.run.time}/config/${tests.config.file} WAIT CLEARLOGS"/>
<echo>While the tests are running you may tail the job logs at</echo>
<echo>${staf.install.dir}/${staf.name}/data-${host.name}/service/log/MACHINE/${host.name}/GLOBAL</echo>
diff --git a/opends/tests/staf-tests/shared/tests/runTestJob.xml b/opends/tests/staf-tests/shared/tests/runTestJob.xml
index 74c0cc0..51ad740 100644
--- a/opends/tests/staf-tests/shared/tests/runTestJob.xml
+++ b/opends/tests/staf-tests/shared/tests/runTestJob.xml
@@ -184,7 +184,7 @@
ServerRevision='unknown'
ServerPackage='%s/%s' % (ZIPPATH,ZIPNAME)
- # The jdmkrt.jar can be included in the OpenDS archive
+ # The jdmkrt.jar can be included in the OpenDJ archive
if not PRODUCTNAME.startswith('OpenDJ'):
ServerSNMPJarFile='addons/jdmkrt.jar'
else:
--
Gitblit v1.10.0