Commit 19c3e957 authored by Sebastien Petitdemange's avatar Sebastien Petitdemange

Merge branch 'emulators_moved' into 'master'

moved 'emulators' code to tests directory

Closes #466

See merge request !951
parents 78ee9223 c86e999a
Pipeline #6224 passed with stages
in 21 minutes and 34 seconds
[tool:pytest]
addopts = -v --ignore=tests/images --ignore=tests/test_configuration --ignore=tests/controllers_hw
addopts = -v --ignore=tests/images --ignore=tests/test_configuration --ignore=tests/controllers_hw --ignore=tests/emulators
usefixtures = clean_louie clean_gevent clean_session
filterwarnings =
ignore::DeprecationWarning
......
......@@ -36,7 +36,7 @@ import functools
import gevent
from bliss.controllers.emulator import BaseDevice
from .emulator import BaseDevice
def Cmd(default=None, allowed=None, access="rw", dtype=None):
......
......@@ -29,7 +29,7 @@ import logging
import weakref
import functools
from bliss.controllers.emulator import BaseDevice
from .emulator import BaseDevice
MAX_AXIS = 128
......
......@@ -47,7 +47,7 @@ import inspect
import collections
from bliss.comm.scpi import Commands
from bliss.controllers.emulator import BaseDevice
from .emulator import BaseDevice
class SCPIError(enum.Enum):
......
......@@ -32,7 +32,7 @@ import enum
import inspect
import collections
from bliss.controllers.emulator import BaseDevice
from .emulator import BaseDevice
class VSAxis(object):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment