From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opends/tests/staf-tests/shared/tests/runTestJob.xml | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/opends/tests/staf-tests/shared/tests/runTestJob.xml b/opends/tests/staf-tests/shared/tests/runTestJob.xml
index b3d3a4f..ec5db8d 100644
--- a/opends/tests/staf-tests/shared/tests/runTestJob.xml
+++ b/opends/tests/staf-tests/shared/tests/runTestJob.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2006-2009 Sun Microsystems, Inc.
+ ! Copyright 2006-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -51,6 +51,28 @@
from common import *
</script>
+ <!-- Overwrite the TESTS_TIMESTAMP value defined in the config.py file -->
+ <script>
+ import time
+ timestamp = time.time()
+
+ oldTimeStamp = """TESTS_TIMESTAMP = .*"""
+ newTimeStamp = """TESTS_TIMESTAMP = %s""" % timestamp
+
+ import re
+ timeRegExp = re.compile(oldTimeStamp)
+
+ configFile = STAXJobScriptFiles[0]
+ configInput = open(configFile, 'r')
+ c0 = configInput.read()
+ c1 = timeRegExp.sub(newTimeStamp, c0)
+ configInput.close()
+
+ configOutput = open(configFile,'w')
+ configOutput.write(c1)
+ configOutput.close()
+ </script>
+
<message>'PATH= %s' % sys.path</message>
<!-- Check some of the optional variables from config.py -->
@@ -96,7 +118,9 @@
</message>
<script>
- listOfChildren=STAXResult
+ listOfChildren = STAXResult['listOfChildren']
+ REPLICATION_SPLIT_SERVERS = STAXResult['replication.split']
+ REPLICATION_ECL_MODE = STAXResult['replication.eclmode']
</script>
</sequence>
<else>
@@ -516,7 +540,8 @@
sutElementList.append(['server-package',ServerPackage])
sutElementList.append(['snmp-jarfile',ServerSNMPJarFile])
sutElementList.append(['md5-sum','TDB'])
-
+ sutElementList.append(['original-archive',ORIGINAL_ARCHIVE])
+
write_text_elements(sut,sutElementList)
# Create the sut dsml element
--
Gitblit v1.10.0