From 4d9ec51b7c325e3367501e44dedd16132f937785 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Mon, 23 Jun 2008 16:04:30 +0000
Subject: [PATCH] QA: System Test: Split clients to have preamble,run,postamble
---
opends/tests/system-tests/phases/log/log.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/opends/tests/system-tests/phases/log/log.xml b/opends/tests/system-tests/phases/log/log.xml
index ce4dc6d..c71f5c4 100755
--- a/opends/tests/system-tests/phases/log/log.xml
+++ b/opends/tests/system-tests/phases/log/log.xml
@@ -80,24 +80,28 @@
<sequence>
<if expr="type == 'client'">
<script>
- logFile = '%s/%s_%s_%s_%s.xml' % \
- ( LOG_TMP_DIR,prefix,\
+ logName = '%s_%s_%s_%s' % \
+ ( prefix,\
object.getName(),object.getHost(),object.getId())
</script>
<elseif expr="type == 'instance'">
<script>
- logFile = '%s/%s_%s_%s.xml' % \
- (LOG_TMP_DIR,prefix,object.getName(),object.getHost())
+ logName = '%s_%s_%s' % (prefix,object.getName(),object.getHost())
</script>
</elseif>
<else>
<script>
- logFile = 'getLogFileName_%s' % NOT_DEFINED
+ logName = 'getLogFileName_%s' % NOT_DEFINED
</script>
</else>
</if>
+
+ <script>
+ logFile = '%s/%s.xml' % (LOG_TMP_DIR,logName)
+ </script>
+
<return>
- logFile
+ [ logFile , logName ]
</return>
</sequence>
</function>
@@ -212,7 +216,7 @@
}
</call>
<script>
- cFileList.append(STAXResult)
+ cFileList.append(STAXResult[0])
</script>
</sequence>
</iterate>
--
Gitblit v1.10.0