FSM: correctly handle empty args in composition

jon-jacky · jon-jacky · commit b648581b0a36 · 2012-09-26T09:08:05.000-07:00
Also, in steppers, omit initial test message
because it can remain in buffers and confuse test results
diff --git a/pymodel/FSM.py b/pymodel/FSM.py
@@ -48,7 +48,8 @@ def ActionEnabled(self, a, args):
     action a with args is enabled in the current state
     """
     # no cleanup check here
-    return any([(a == action and args == arguments)
+    # any args matches empty arguments in FSM
+    return any([(a == action and (not arguments or args == arguments))
                 for (current,(action, arguments, result),next) 
                 in self.module.graph
                 if current == self.current ])
diff --git a/samples/Socket/Stepper.py b/samples/Socket/Stepper.py
@@ -59,8 +59,7 @@
 # Now server can read by repeating data=server.recv(n) until EOF
 # Then should server.close()
 
-# DOESN'T ALWAYS WORK WITH socket_simulator.py WHEN 
-#  len(buffers) < len('Hello world!')
+# Omit - can leave stuff in buffers that confuses test runs
 # Test the connection
 #client.send('Hello world!')
 #data = server.recv(line_length)
diff --git a/samples/Socket/stepper_a.py b/samples/Socket/stepper_a.py
@@ -67,10 +67,11 @@
 # Now server can read by repeating data=server.recv(n) until EOF
 # Then should server.close()
 
+# Omit - can leave stuff in buffers that confuses test runs
 # Test the connection
-client.send('Hello world!')
-data = server.recv(line_length)
-print 'Try a test message, server got "%s"\n' % data
+#client.send('Hello world!')
+#data = server.recv(line_length)
+#print 'Try a test message, server got "%s"\n' % data
 
 def test_action(aname, args, modelResult):
   """
diff --git a/samples/Socket/stepper_o.py b/samples/Socket/stepper_o.py
@@ -64,10 +64,11 @@
 # Now server can read by repeating data=server.recv(n) until EOF
 # Then should server.close()
 
+# Omit - can leave stuff in buffers that confuses test runs
 # Test the connection
-client.send('Hello world!')
-data = server.recv(line_length)
-print 'Try a test message, server got "%s"\n' % data
+#client.send('Hello world!')
+#data = server.recv(line_length)
+#print 'Try a test message, server got "%s"\n' % data
 
 def test_action(aname, args, modelResult):
   """
