ソースを参照

travis friendly

Bastien Sevajol 7 年 前
コミット
3fcd580aa7
共有3 個のファイルを変更した7 個の追加3 個の削除を含む
  1. 1 0
      requirements.txt
  2. 4 1
      tests/test_processing.py
  3. 2 2
      tests/test_terminals.py

+ 1 - 0
requirements.txt ファイルの表示

4
 coverage==4.4.1
4
 coverage==4.4.1
5
 execnet==1.4.1
5
 execnet==1.4.1
6
 packaging==16.8
6
 packaging==16.8
7
+psutil==5.2.2
7
 py==1.4.31
8
 py==1.4.31
8
 pyglet==1.2.4
9
 pyglet==1.2.4
9
 pymlconf==0.7.0
10
 pymlconf==0.7.0

+ 4 - 1
tests/test_processing.py ファイルの表示

2
 import os
2
 import os
3
 
3
 
4
 import multiprocessing
4
 import multiprocessing
5
+
6
+import psutil
5
 import pytest
7
 import pytest
6
 
8
 
7
 from synergine2.processing import ProcessManager
9
 from synergine2.processing import ProcessManager
36
         result = sum(data)
38
         result = sum(data)
37
         return current_pid, MyFakeClass(result)
39
         return current_pid, MyFakeClass(result)
38
 
40
 
39
-    @pytest.mark.skipif(multiprocessing.cpu_count() < 2, reason="requires 2 or more cpus")
41
+    @pytest.mark.skipif(len(psutil.Process().cpu_affinity()) < 2, reason="requires 2 or more cpus")
40
     def test_parallel_jobs_with_scalar(self):
42
     def test_parallel_jobs_with_scalar(self):
41
         chunk_manager = ChunkManager(2)
43
         chunk_manager = ChunkManager(2)
42
         process_manager = ProcessManager(
44
         process_manager = ProcessManager(
82
         assert process_id == os.getpid()
84
         assert process_id == os.getpid()
83
         assert final_result == 4950
85
         assert final_result == 4950
84
 
86
 
87
+    @pytest.mark.skipif(len(psutil.Process().cpu_affinity()) < 2, reason="requires 2 or more cpus")
85
     def test_parallel_jobs_with_objects(self):
88
     def test_parallel_jobs_with_objects(self):
86
         chunk_manager = ChunkManager(4)
89
         chunk_manager = ChunkManager(4)
87
         process_manager = ProcessManager(
90
         process_manager = ProcessManager(

+ 2 - 2
tests/test_terminals.py ファイルの表示

143
         an_other_event = AnOtherEvent(168)
143
         an_other_event = AnOtherEvent(168)
144
         terminals_manager.send(TerminalPackage(events=[an_event, an_other_event]))
144
         terminals_manager.send(TerminalPackage(events=[an_event, an_other_event]))
145
 
145
 
146
-        # We wait max 2s (see time.sleep) to consider
146
+        # We wait max 10s (see time.sleep) to consider
147
         # process have finished. If not, it will fail
147
         # process have finished. If not, it will fail
148
         packages = []
148
         packages = []
149
-        for i in range(200):
149
+        for i in range(1000):
150
             packages.extend(terminals_manager.receive())
150
             packages.extend(terminals_manager.receive())
151
             if len(packages) == 1:
151
             if len(packages) == 1:
152
                 break
152
                 break