소스 검색

name processes and enhance a test

Bastien Sevajol 6 년 전
부모
커밋
f319ed5dbc
3개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 1
      synergine2/processing.py
  2. 2 2
      synergine2/terminals.py
  3. 2 0
      tests/test_terminals.py

+ 2 - 1
synergine2/processing.py 파일 보기

@@ -43,7 +43,8 @@ class Worker(object):
43 43
                 self.local_write_pipe,
44 44
                 self.process_read_pipe,
45 45
             ),
46
-            kwargs={'seed': random.random()}
46
+            kwargs={'seed': random.random()},
47
+            name='Worker',
47 48
         )
48 49
         self.db = None  # TODO delete
49 50
         self.process.start()

+ 2 - 2
synergine2/terminals.py 파일 보기

@@ -109,7 +109,7 @@ class Terminal(BaseObject):
109 109
             from_terminal=self,
110 110
             from_terminal_input_queue=output_queue,
111 111
             from_terminal_output_queue=input_queue,
112
-        ))
112
+        ), name='Core')
113 113
         self.core_process.start()
114 114
 
115 115
         # Core is started, continue this terminal job
@@ -211,7 +211,7 @@ class TerminalManager(BaseObject):
211 211
             process = Process(target=terminal.start, kwargs=dict(
212 212
                 input_queue=output_queue,
213 213
                 output_queue=input_queue,
214
-            ))
214
+            ), name=terminal.__class__.__name__)
215 215
             process.start()
216 216
 
217 217
     def stop(self):

+ 2 - 0
tests/test_terminals.py 파일 보기

@@ -7,6 +7,7 @@ from synergine2.config import Config
7 7
 from synergine2.core import Core
8 8
 from synergine2.cycle import CycleManager
9 9
 from synergine2.log import SynergineLogger
10
+from synergine2.share import shared
10 11
 from synergine2.simulation import Event
11 12
 from synergine2.simulation import Simulation
12 13
 from synergine2.simulation import Subjects
@@ -165,6 +166,7 @@ class TestTerminals(BaseTest):
165 166
 
166 167
     @pytest.mark.skip(reason="Buggy ! Never terminate, all processes closed ?")
167 168
     def test_terminal_as_main_process(self):
169
+        shared.reset()
168 170
         config = Config()
169 171
         logger = SynergineLogger('test')
170 172
         simulation = Simulation(config)