[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/HLA_TestsSuite dtest_Interactive_F...
From: |
certi-cvs |
Subject: |
[certi-cvs] applications/HLA_TestsSuite dtest_Interactive_F... |
Date: |
Mon, 09 Aug 2010 14:48:57 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Eric NOULARD <erk> 10/08/09 14:48:57
Modified files:
HLA_TestsSuite : dtest_Interactive_Federate1516.py
Log message:
Fix some copy/paste mismatches...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/dtest_Interactive_Federate1516.py?cvsroot=certi&r1=1.1&r2=1.2
Patches:
Index: dtest_Interactive_Federate1516.py
===================================================================
RCS file:
/sources/certi/applications/HLA_TestsSuite/dtest_Interactive_Federate1516.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dtest_Interactive_Federate1516.py 24 Jun 2010 12:32:42 -0000 1.1
+++ dtest_Interactive_Federate1516.py 9 Aug 2010 14:48:57 -0000 1.2
@@ -96,7 +96,7 @@
#dtest.DTester.logger.setLevel(level=logging.DEBUG)
# describe first federate run steps
-firstFederate.timeout = 20
+firstFederate.timeout = 35
firstFederate.stdout = file(firstFederate.name + ".out",'w+')
firstFederate.stdin = file(firstFederate.name + ".in",'w+')
firstFederate.stderr = file(firstFederate.name + ".err",'w+')
@@ -115,6 +115,7 @@
firstFederate.addRunStep("sendToCommand",string="cfe\n")
firstFederate.addRunStep("expectFromCommand",pattern="Federation creee")
firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,firstFederate.name+"
has create federation")
+firstFederate.addRunStep("barrier","wait creation from first")
#join federation
firstFederate.addRunStep("expectFromCommand",pattern="Choisissez une action :")
@@ -144,7 +145,7 @@
firstFederate.addRunStep("barrier","All Federate(s) ended")
# other federate
-otherFederate.timeout = 20
+otherFederate.timeout = 35
otherFederate.stdout = file(otherFederate.name + ".out",'w+')
otherFederate.stdin = file(otherFederate.name + ".in",'w+')
otherFederate.stderr = file(otherFederate.name + ".err",'w+')
@@ -160,33 +161,34 @@
#create federation
otherFederate.addRunStep("expectFromCommand",pattern="Choisissez une action :")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"ACTION"+firstFederate.name)
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,"ACTION"+otherFederate.name)
+otherFederate.addRunStep("barrier","wait creation from first")
otherFederate.addRunStep("sendToCommand",string="cfe\n")
otherFederate.addRunStep("expectFromCommand",pattern="Federation non creee")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,firstFederate.name+"
federation already exists")
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,otherFederate.name+"
federation already exists")
#join federation
otherFederate.addRunStep("expectFromCommand",pattern="Choisissez une action :")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"ACTION"+firstFederate.name)
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,"ACTION"+otherFederate.name)
otherFederate.addRunStep("sendToCommand",string="jfe\n")
otherFederate.addRunStep("expectFromCommand",pattern="Federation rejointe")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,firstFederate.name+"
has join federation")
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,otherFederate.name+"
has join federation")
otherFederate.addRunStep("barrier","Wait others2...")
#resign federation
otherFederate.addRunStep("expectFromCommand",pattern="Choisissez une action :")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"ACTION"+firstFederate.name)
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,"ACTION"+otherFederate.name)
otherFederate.addRunStep("sendToCommand",string="rfe\n")
otherFederate.addRunStep("expectFromCommand",pattern="federation quittee")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,firstFederate.name+"
has resign federation")
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,otherFederate.name+"
has resign federation")
otherFederate.addRunStep("barrier","Wait others3...")
#destroy federation
otherFederate.addRunStep("expectFromCommand",pattern="Choisissez une action :")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"ACTION"+firstFederate.name)
-otherFederate.addRunStep("sendToCommand",string="cfe\n")
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,"ACTION"+otherFederate.name)
+otherFederate.addRunStep("sendToCommand",string="dfe\n")
otherFederate.addRunStep("expectFromCommand",pattern="No federation to
destroy")
-otherFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,firstFederate.name+"
no federation to destroy")
+otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,otherFederate.name+"
no federation to destroy")
#otherFederate.addRunStep("expectFromCommand",pattern="Choisissez une action
:")
#otherFederate.addRunStep("ok",otherFederate.getFutureLastStepStatus,"ACTION"+otherFederate.name)
@@ -200,8 +202,8 @@
otherFederate.addRunStep("barrier","All Federate(s) ended")
def goTest():
- myDTestMaster = dtest.DTestMaster("HLA Test Zero Lookahead","Launch RTIG +
two interactive federates for testing zero lookahead")
- myDTestMaster.timeout = 40
+ myDTestMaster = dtest.DTestMaster("HLA Interactive-1516","Launch RTIG +
two interactive federates for testing zero lookahead")
+ myDTestMaster.timeout = 50
myDTestMaster.register(rtig)
myDTestMaster.register(firstFederate)
myDTestMaster.register(otherFederate)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] applications/HLA_TestsSuite dtest_Interactive_F...,
certi-cvs <=