Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[samples/datafiles.git] / Superv / Python / GraphErrMsgs.py

diff --git a/Superv/Python/GraphErrMsgs.py b/Superv/Python/GraphErrMsgs.py
index 92a1e158c14607dbd2136f5ff7313759958a9547..7d6214352681e9ae4fee3e2b90487279623a4e48 100644 (file)
--- a/Superv/Python/GraphErrMsgs.py
+++ b/Superv/Python/GraphErrMsgs.py
@@ -1,5 +1,7 @@
 from SuperV import *
 
+import sys
+
 GraphErrMsgs = Graph( "GraphErrMsgs" )
 
 anXmlFile = os.getenv('DATA_DIR') + '/Superv/Graphs/SyrStruct.xml'
@@ -659,8 +661,9 @@ if RunOk == 0 :
 
 GraphSyrControlAve.DoneW()
 
-Messages = GraphSyrControlAve.Messages()
-if Messages != "" :
+State = GraphSyrControlAve.State()
+if State != SUPERV.DoneState:
+    Messages = GraphSyrControlAve.Messages()
     print "Error GraphSyrControlAve has Messages :"
     print Messages
     sys.exit(1)
@@ -684,7 +687,8 @@ if RunOk == 0 :
 GraphSyrControlAveValid.DoneW()
 
 Messages = GraphSyrControlAveValid.Messages()
-if Messages != "" :
+State = GraphSyrControlAveValid.State()
+if State != SUPERV.DoneState:
     print "Error GraphSyrControlAveValid has Messages :"
     print Messages
     sys.exit(1)
@@ -707,8 +711,9 @@ if RunOk == 0 :
 
 GraphSyrControlAveExecutable.DoneW()
 
-Messages = GraphSyrControlAveExecutable.Messages()
-if Messages != "" :
+State = GraphSyrControlAveExecutable.State()
+if State != SUPERV.DoneState:
+    Messages = GraphSyrControlAveExecutable.Messages()
     print "Error GraphSyrControlAveExecutable has Messages :"
     print Messages
     sys.exit(1)
@@ -745,7 +750,7 @@ anXmlFile = os.getenv('DATA_DIR') + '/Superv/Graphs/GraphSyrControlAveNOTValid1.
 GraphSyrControlAveNOTValid1.Import( anXmlFile )
 
 RunOk = GraphSyrControlAveNOTValid1.Run()
-if RunOk == 0 :
+if RunOk != 0 :
     print "Error : UnSuccess call to Run"
     print "GraphSyrControlAveNOTValid1 test failed"
     sys.exit(1)
@@ -756,6 +761,7 @@ print "GraphSyrControlAveNOTValid1 Errors Messages :"
 print GraphSyrControlAveNOTValid1.Messages()
 
 
+
 from SuperV import *
 
 # GraphSwitch
@@ -1101,8 +1107,8 @@ anXmlFile = os.getenv('DATA_DIR') + '/Superv/Graphs/GraphSwitchManyCases.xml'
 GraphSwitchManyCases.Import( anXmlFile )
 
 RunOk = GraphSwitchManyCases.Run()
-if RunOk != 0 :
-    print "Error : Success call to Run"
+if RunOk == 0:
+    print "Error : UnSuccess call to Run"
     print "GraphSwitchManyCases test failed"
     sys.exit(1)
 
@@ -1225,10 +1231,3 @@ GraphLoopSwitchGatesDefault.DoneW()
 
 print "GraphLoopSwitchGatesDefault Errors Messages :"
 print GraphLoopSwitchGatesDefault.Messages()
-
-
-
-
-
-sys.exit(0)
-