Browse Source

travis friendly

Bastien Sevajol 7 years ago
parent
commit
3fcd580aa7
3 changed files with 7 additions and 3 deletions
  1. 1 0
      requirements.txt
  2. 4 1
      tests/test_processing.py
  3. 2 2
      tests/test_terminals.py

+ 1 - 0
requirements.txt View File

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

+ 4 - 1
tests/test_processing.py View File

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

+ 2 - 2
tests/test_terminals.py View File

@@ -143,10 +143,10 @@ class TestTerminals(BaseTest):
143 143
         an_other_event = AnOtherEvent(168)
144 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 147
         # process have finished. If not, it will fail
148 148
         packages = []
149
-        for i in range(200):
149
+        for i in range(1000):
150 150
             packages.extend(terminals_manager.receive())
151 151
             if len(packages) == 1:
152 152
                 break