Skip to content

Commit

Permalink
fix: Print error instead of failing.
Browse files Browse the repository at this point in the history
  • Loading branch information
giulioungaretti committed Jul 28, 2016
1 parent 228bb4c commit 75c260e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions qcodes/tests/test_instrument_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@


def schedule(queries, query_queue):
'''
queries is a sequence of (delay, args)
"""
queries is a sequence of (delay, args)
query_queue is a queue to push these queries to, with each one waiting
its delay after sending the previous one
'''
"""
for delay, args in queries:
time.sleep(delay)
query_queue.put(args)
Expand Down
8 changes: 5 additions & 3 deletions qcodes/tests/test_loop.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from unittest import TestCase
from unittest.mock import patch
import time
from datetime import datetime
import logging
import multiprocessing as mp
import numpy as np
import time
from unittest import TestCase
from unittest.mock import patch

from qcodes.loops import (Loop, MP_NAME, get_bg, halt_bg, ActiveLoop,
_DebugInterrupt)
Expand Down Expand Up @@ -104,6 +105,7 @@ def test_local_instrument(self):
# The RunimError will never be raised here, as the forkmethod
# won't try to pickle anything at all.
else:
logging.error("this should not be allowed, but for now we let it be")
loop_local.run(location=self.location, quiet=True)

data = loop_local.run(location=self.location2, background=False,
Expand Down

0 comments on commit 75c260e

Please sign in to comment.