Browse Source

name processes and enhance a test

Bastien Sevajol 7 years ago
parent
commit
f319ed5dbc
3 changed files with 6 additions and 3 deletions
  1. 2 1
      synergine2/processing.py
  2. 2 2
      synergine2/terminals.py
  3. 2 0
      tests/test_terminals.py

+ 2 - 1
synergine2/processing.py View File

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

+ 2 - 2
synergine2/terminals.py View File

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

+ 2 - 0
tests/test_terminals.py View File

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