From 8310417a85804a034b2b5b58bc9f48d0687f829b Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 13 May 2008 10:24:20 +0000
Subject: [PATCH] Add tests for SNMP feature

---
 opends/tests/functional-tests/testcases/setup/general_options.xml |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/setup/general_options.xml b/opends/tests/functional-tests/testcases/setup/general_options.xml
index d1a35a2..6fbe5d5 100644
--- a/opends/tests/functional-tests/testcases/setup/general_options.xml
+++ b/opends/tests/functional-tests/testcases/setup/general_options.xml
@@ -84,9 +84,7 @@
               'command'   : setupCmd,
               'arguments' : setupParams,
               'path'      : ODS_UNZIPPED,
-              'expectedRC': 0,
-              'outputPath': OUT_GROUP,
-              'outputFile': 'go-setup-version.txt',
+              'outputFile': '%s/go-setup-version.txt' % OUT_GROUP
             }
           </call>
 
@@ -97,8 +95,7 @@
           <call function="'grep'">
             { 'location'  : STAXServiceMachine,
               'filename'  : grepFile,
-              'testString': 'OpenDS Directory Server',
-              'expectedRC': 0,
+              'testString': 'OpenDS Directory Server'
             }
           </call>
 
@@ -115,9 +112,7 @@
               'command'   : uninstallCmd,
               'arguments' : uninstallParams,
               'path'      : ODS_UNZIPPED,
-              'expectedRC': 0,
-              'outputPath': OUT_GROUP,
-              'outputFile': 'go-uninstall-version.txt',
+              'outputFile': '%s/go-uninstall-version.txt' % OUT_GROUP
             }
           </call>
 
@@ -128,8 +123,7 @@
           <call function="'grep'">
             { 'location'  : STAXServiceMachine,
               'filename'  : grepFile,
-              'testString': 'OpenDS Directory Server',
-              'expectedRC': 0,
+              'testString': 'OpenDS Directory Server'
             }
           </call>
 
@@ -169,9 +163,7 @@
               'command'   : setupCmd,
               'arguments' : setupParams,
               'path'      : ODS_UNZIPPED,
-              'expectedRC': 0,
-              'outputPath': OUT_GROUP,
-              'outputFile': 'go-setup-help.txt',
+              'outputFile': '%s/go-setup-help.txt' % OUT_GROUP
             }
           </call>
 
@@ -182,8 +174,7 @@
           <call function="'grep'">
             { 'location'  : STAXServiceMachine,
               'filename'  : grepFile,
-              'testString': 'Usage',
-              'expectedRC': 0,
+              'testString': 'Usage'
             }
           </call>
 
@@ -200,9 +191,7 @@
               'command'   : uninstallCmd,
               'arguments' : uninstallParams,
               'path'      : ODS_UNZIPPED,
-              'expectedRC': 0,
-              'outputPath': OUT_GROUP,
-              'outputFile': 'go-uninstall-help.txt',
+              'outputFile': '%s/go-uninstall-help.txt' % OUT_GROUP
             }
           </call>
 
@@ -213,8 +202,7 @@
           <call function="'grep'">
             { 'location'  : STAXServiceMachine,
               'filename'  : grepFile,
-              'testString': 'Usage',
-              'expectedRC': 0,
+              'testString': 'Usage'
             }
           </call>
 

--
Gitblit v1.10.0