From 45305ff4bdf983803925be2bdb978de955e33b3c Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Thu, 29 Nov 2007 19:07:40 +0000
Subject: [PATCH] Replication tests: fixes, enhancements + new encryption testsuite
---
opends/tests/shared/functions/utils.xml | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/opends/tests/shared/functions/utils.xml b/opends/tests/shared/functions/utils.xml
index fce3da0..471cf6b 100755
--- a/opends/tests/shared/functions/utils.xml
+++ b/opends/tests/shared/functions/utils.xml
@@ -1495,13 +1495,18 @@
Kill the ldap server
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s'
+ % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1516,10 +1521,21 @@
<script>
pidPath = '%s/logs/server.pid' % dsPath
- pidFile = open(pidPath, 'r')
- pid = pidFile.readline()[:-1]
- pidFile.close()
+ _args = '%s' % pidPath
+ </script>
+ <call function="'runSTAFCommand'">
+ { 'name' : 'Read server pid file',
+ 'location' : location,
+ 'service' : 'FS',
+ 'request' : 'GET FILE',
+ 'arguments' : _args
+ }
+ </call>
+
+ <script>
+ pid = STAXResult[:-1]
+
if isWindows:
_cmd = 'tskill'
_args = pid
--
Gitblit v1.10.0