[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/HLA_TestsSuite dtest_create_destro...
From: |
certi-cvs |
Subject: |
[certi-cvs] applications/HLA_TestsSuite dtest_create_destro... |
Date: |
Mon, 12 May 2008 21:37:54 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Eric NOULARD <erk> 08/05/12 21:37:54
Modified files:
HLA_TestsSuite : dtest_create_destroy.py
Log message:
More generic dtest script.
This one will detect shell type in order to source appropriate
CERTI script
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/dtest_create_destroy.py?cvsroot=certi&r1=1.3&r2=1.4
Patches:
Index: dtest_create_destroy.py
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/dtest_create_destroy.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dtest_create_destroy.py 10 May 2008 16:05:57 -0000 1.3
+++ dtest_create_destroy.py 12 May 2008 21:37:54 -0000 1.4
@@ -29,18 +29,11 @@
import getopt, sys
import dtest
-def conditionalRunShellScript(dtester,c_shell_cmd,bourne_shell_cmd):
- dtester.addRunStep("runCommand",command="echo $SHELL")
- dtester.addRunStep("expectFromCommand",pattern=".*csh",timeout=3)
- dtester.addRunStep("ifThenElse",dtester.getFutureLastStepStatus)
- dtester.addRunStep("runCommand",c_shell_cmd)
- dtester.addRunStep("runCommand",bourne_shell_cmd)
-
def usage():
- print "Usage:\n %s [--help] [--certi_home=<path>]
--rtig=<user>@[<host>]:<rtig_path> --federate=<user>@[<host>]:<federate_path>"
% sys.argv[0]
+ print "Usage:\n %s [--help] [--certi_home=<path>]
--rtig=[[<user>@]<host>]:<rtig_path>
--federate=[[<user>@]<host>]:<federate_path>" % sys.argv[0]
try:
- opts, args = getopt.getopt(sys.argv[1:], "hr:f:c:d:", ["help","rtig=",
"federate=","certi_home=","display="])
+ opts, args = getopt.getopt(sys.argv[1:], "hr:f:c:", ["help","rtig=",
"federate=","certi_home="])
except getopt.GetoptError, err:
print >> sys.stderr, "opt = %s, msg = %s" % (err.opt,err.msg)
usage()
@@ -48,7 +41,6 @@
## default values
certi_home_defined=False
-display=":0.0"
rtig_param = dtest.Utils.getUserHostPath("rtig")
federate_param = dtest.Utils.getUserHostPath("create_destroy")
federate_param['fom']="create_destroy.fed"
@@ -64,8 +56,6 @@
if o in ("-c", "--certi_home"):
certi_home = a
certi_home_defined=True
- if o in ("--display"):
- display = a;
if not certi_home_defined:
if os.environ.has_key("CERTI_HOME"):
@@ -89,7 +79,7 @@
# describe RTIG run steps
rtig.addRunStep("ok",True,"HLA test create_destroy Starts.")
-conditionalRunShellScript(rtig,c_shell_cmd="source
"+certi_home+"/share/scripts/myCERTI_env.csh "+rtig_param['host'],
+dtest.ReusableSequence.addConditionalRunShellScript(rtig,c_shell_cmd="source
"+certi_home+"/share/scripts/myCERTI_env.csh "+rtig_param['host'],
bourne_shell_cmd="source
"+certi_home+"/share/scripts/myCERTI_env.sh "+rtig_param['host'])
rtig.addRunStep("runCommand",command=rtig_param['path'])
rtig.addRunStep("expectFromCommand",pattern="CERTI RTIG up and
running",timeout=5)
@@ -105,7 +95,7 @@
firstFederate.stdin = file(firstFederate.name + ".in",'w+')
firstFederate.stderr = file(firstFederate.name + ".err",'w+')
firstFederate.addRunStep("barrier","RTIG started")
-conditionalRunShellScript(firstFederate,c_shell_cmd="source
"+certi_home+"/share/scripts/myCERTI_env.csh "+rtig_param['host'],
+dtest.ReusableSequence.addConditionalRunShellScript(firstFederate,c_shell_cmd="source
"+certi_home+"/share/scripts/myCERTI_env.csh "+rtig_param['host'],
bourne_shell_cmd="source
"+certi_home+"/share/scripts/myCERTI_env.sh "+rtig_param['host'])
firstFederate.addRunStep("runCommand",command=federate_param['path']+"
"+firstFederate.name)
firstFederate.addRunStep("expectFromCommand",pattern="Do you want to change
Federation name or fed file .* \[y/n\]")