M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

worker, scheduler: fix unit tests on Windows

This commit is contained in:
Yann Sionneau 2015-08-27 18:23:26 +02:00
parent 7db0498a9a
commit 4a16ea111c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/test/scheduler.py
View File

@ -1,6 +1,7 @@
import unittest import unittest
import asyncio import asyncio
import sys import sys
import os
from time import time, sleep from time import time, sleep
from artiq import * from artiq import *
@ -63,7 +64,10 @@ _handlers = {
class SchedulerCase(unittest.TestCase): class SchedulerCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.loop = asyncio.new_event_loop() if os.name == "nt":
self.loop = asyncio.ProactorEventLoop()
else:
self.loop = asyncio.new_event_loop()
asyncio.set_event_loop(self.loop) asyncio.set_event_loop(self.loop)
def test_steps(self): def test_steps(self):

6
artiq/test/worker.py
View File

@ -1,6 +1,7 @@
import unittest import unittest
import asyncio import asyncio
import sys import sys
import os
from time import sleep from time import sleep
from artiq import * from artiq import *
@ -59,7 +60,10 @@ def _run_experiment(class_name):
class WatchdogCase(unittest.TestCase): class WatchdogCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.loop = asyncio.new_event_loop() if os.name == "nt":
self.loop = asyncio.ProactorEventLoop()
else:
self.loop = asyncio.new_event_loop()
asyncio.set_event_loop(self.loop) asyncio.set_event_loop(self.loop)
def test_watchdog_no_timeout(self): def test_watchdog_no_timeout(self):