hiro/jobmanager
1
0
Fork 0
mirror of https://github.com/vale981/jobmanager synced 2025-03-06 02:11:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

some merged conflics resolved

Browse source
This commit is contained in:
Richard Hartmann 2014-10-14 16:48:30 +02:00
commit 13fcf458a0
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test_jobmanager.py
View file

@ -786,7 +786,11 @@ def test_sb():
interval=0.2, interval=0.2,
speed_calc_cycles=10, speed_calc_cycles=10,
width='auto', width='auto',
<<<<<<< HEAD
verbose=2, verbose=2,
=======
verbose=0,
>>>>>>> 6f9bec610f8435b7fe004eded1be9bb1eb58352d
sigint='stop', sigint='stop',
sigterm='stop', sigterm='stop',
name='sb', name='sb',
@ -803,7 +807,11 @@ def test_sb():
time.sleep(1) time.sleep(1)
break break
<<<<<<< HEAD
time.sleep(0.05) time.sleep(0.05)
=======
time.sleep(0.02)
>>>>>>> 6f9bec610f8435b7fe004eded1be9bb1eb58352d
def test_status_counter(): def test_status_counter():
c = jobmanager.UnsignedIntValue(val=0) c = jobmanager.UnsignedIntValue(val=0)
@ -878,4 +886,4 @@ if __name__ == "__main__":
test_status_counter() test_status_counter()
test_status_counter_multi() test_status_counter_multi()
pass pass