소스 검색

Fix constructor_AL to not time out on a test

Yentl Van Tendeloo 8 년 전
부모
커밋
aa3e4742db
1개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 3
      hybrid_server/classes/mvkcontroller.xml

+ 4 - 3
hybrid_server/classes/mvkcontroller.xml

@@ -279,11 +279,12 @@
                         </script>
                     </onentry>
 
-                    <transition cond="self.outputs" target="../process_data"/>
+                    <!-- Add after self.sccd_yield() as otherwise some tests will fail (e.g., constructors_AL which has to time out). -->
+                    <transition cond="self.outputs" after="self.sccd_yield()" target="../process_data"/>
+                    <transition cond="not self.timeout and not self.outputs" after="self.sccd_yield()" target="."/>
 
+                    <!-- Need sccd_yield here anyway, as we really want to pause. -->
                     <transition cond="self.timeout and not self.outputs" after="self.sccd_yield() + 0.10" target="."/>
-
-                    <transition cond="not self.timeout and not self.outputs" target="."/>
                 </state>
 
                 <state id="process_data">