瀏覽代碼

Fix SleepKernel in tests for generated

Yentl Van Tendeloo 8 年之前
父節點
當前提交
ec50c60203

+ 1 - 1
kernel/modelverse_kernel/generated.py

@@ -1258,4 +1258,4 @@ class ModelverseKernel(object):
 			else:
 				# no rules were applicable, so idle for some time
 				pass #TODO
-				raise primitive_functions.SleepKernel(1.0, True)
+				raise primitive_functions.SleepKernel(0.1, True)

+ 7 - 2
kernel/test_generated/rules/test_rules_input.py

@@ -1,5 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
+from modelverse_kernel.primitives import SleepKernel
 from utils import execute_until_finished, MvSWrapper
 
 class TestInput(unittest.TestCase):
@@ -55,8 +56,12 @@ class TestInput(unittest.TestCase):
         self.mvs.execute("CD", [task_frame, "returnvalue", old_retval])
         self.mvs.execute("CD", [task_root, "input", input_queue_first])
 
-        # Do the invocation until it returns None
-        execute_until_finished(self.mvk, self.mvs)
+        try:
+            # Do the invocation until it returns None
+            execute_until_finished(self.mvk, self.mvs)
+            self.fail()
+        except SleepKernel:
+            pass
 
         # Execution of the command finished, so the MvS should be in the correct new state right now
         self.assertEquals(self.mvs.execute("RD", [root, "task_1"]), task_root)

+ 1 - 1
wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Tue Nov 28 16:06:05 2017
+Date:   Tue Nov 28 16:07:56 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server