[certi-cvs] applications/HLA_TestsSuite dtest_test_FOMParse...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      09/04/01 16:06:34

Modified files:
        HLA_TestsSuite : dtest_test_FOMParse.py dtest_create_destroy.py 

Log message:
        Update dtest scripts

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/dtest_test_FOMParse.py?cvsroot=certi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/dtest_create_destroy.py?cvsroot=certi&r1=1.7&r2=1.8

Patches:
Index: dtest_test_FOMParse.py
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/dtest_test_FOMParse.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dtest_test_FOMParse.py      10 Nov 2008 00:27:12 -0000      1.7
+++ dtest_test_FOMParse.py      1 Apr 2009 16:06:34 -0000       1.8
@@ -30,10 +30,10 @@
 import dtest  
 
 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> --fom=<fom_path> 
--federate=[[<user>@]<host>]:<federate_path>" % sys.argv[0]
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], "hr:f:c:", ["help","rtig=", 
"federate=","certi_home="])
+    opts, args = getopt.getopt(sys.argv[1:], "", ["help","rtig=", 
"federate=","certi_home="])
 except getopt.GetoptError, err:
     print >> sys.stderr, "opt = %s, msg = %s" % (err.opt,err.msg)
     usage()
@@ -43,7 +43,6 @@
 certi_home_defined=False
 rtig_param = dtest.Utils.getUserHostPath("rtig")
 federate_param = dtest.Utils.getUserHostPath("test_FOMParse")
-federate_param['fom']="TestFed.fed"
     
 for o, a in opts:
     if o in ("--help"):

Index: dtest_create_destroy.py
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/dtest_create_destroy.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dtest_create_destroy.py     13 Jun 2008 11:43:02 -0000      1.7
+++ dtest_create_destroy.py     1 Apr 2009 16:06:34 -0000       1.8
@@ -30,10 +30,10 @@
 import dtest  
 
 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> --fom=<fom_path> 
--federate=[[<user>@]<host>]:<federate_path>" % sys.argv[0]
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], "hr:f:c:", ["help","rtig=", 
"federate=","certi_home="])
+    opts, args = getopt.getopt(sys.argv[1:], "", ["help","rtig=", "fom=", 
"federate=","certi_home="])
 except getopt.GetoptError, err:
     print >> sys.stderr, "opt = %s, msg = %s" % (err.opt,err.msg)
     usage()
@@ -43,19 +43,21 @@
 certi_home_defined=False
 rtig_param = dtest.Utils.getUserHostPath("rtig")
 federate_param = dtest.Utils.getUserHostPath("create_destroy")
-federate_param['fom']="create_destroy.fed"
+FOMFile="create_destroy.fed"
     
 for o, a in opts:
     if o in ("--help"):
             usage()
             sys.exit(2)
-    if o in ("-r", "--rtig"):
+    if o in ("--rtig"):
         rtig_param   = dtest.Utils.getUserHostPath(a)
-    if o in ("-f", "--federate"):
+    if o in ("--federate"):
         federate_param = dtest.Utils.getUserHostPath(a)
-    if o in ("-c", "--certi_home"):
+    if o in ("--certi_home"):
         certi_home = a
         certi_home_defined=True
+    if o in ("--fom"):
+        FOMFile = a
         
 if not certi_home_defined:
     if os.environ.has_key("CERTI_HOME"):
@@ -100,8 +102,16 @@
 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\]")
 firstFederate.addRunStep("barrier","First Federate started")
+firstFederate.addRunStep("sendToCommand",string="y\n")
+firstFederate.addRunStep("expectFromCommand",pattern="change Federation name 
.* \[y/n\]")
+firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"Will 
change FED file...")
 firstFederate.addRunStep("sendToCommand",string="n\n")
+firstFederate.addRunStep("expectFromCommand",pattern="change FED file name .* 
\[y/n\]")
+firstFederate.addRunStep("sendToCommand",string="y\n")
+firstFederate.addRunStep("expectFromCommand",pattern="Enter FED file name 
\(and path\) :")
+firstFederate.addRunStep("sendToCommand",string=FOMFile+"\n")
 firstFederate.addRunStep("expectFromCommand",pattern="STEP 1 COMPLETED")
+firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"FED file 
name changed.")
 firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"Sequence 
begins...")
 firstFederate.addRunStep("expectFromCommand",pattern="Do you want to make one 
or more creation federation execution .* :")
 firstFederate.addRunStep("sendToCommand",string="y\n")