summaryrefslogtreecommitdiff
path: root/src/sardana/tango
diff options
context:
space:
mode:
authorcmft <cfalcon@cells.es>2014-02-26 09:09:02 +0100
committerGabriel Jover-Manas <gjover@cells.es>2014-03-28 11:37:38 +0100
commite58c6070dd62e4230198e6ee45694fd4fb04af24 (patch)
tree2142d46506b03e17403a6f4a3920ac2fe915b50d /src/sardana/tango
parent83c18371308b34aabe5625d57f83a253306b17d5 (diff)
Add sardanacustomsettings file
Sardanacustomsettings is a file to define general Sardana configuration variables. Use UNITTEST_DOOR_NAME: name of the door to use in unittest, in the existing test.
Diffstat (limited to 'src/sardana/tango')
-rw-r--r--src/sardana/tango/macroserver/test/macroexecutor.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sardana/tango/macroserver/test/macroexecutor.py b/src/sardana/tango/macroserver/test/macroexecutor.py
index 4276a480..6c7db4b3 100644
--- a/src/sardana/tango/macroserver/test/macroexecutor.py
+++ b/src/sardana/tango/macroserver/test/macroexecutor.py
@@ -4,6 +4,7 @@ import PyTango
from sardana.macroserver.macros.test import BaseMacroExecutor
# TODO: not sure if use this codecs, or prepare some easy one...
from taurus.core.util.codecs import CodecFactory
+from sardana import sardanacustomsettings
class TangoAttrCb(object):
@@ -87,7 +88,7 @@ class TangoMacroExecutor(BaseMacroExecutor):
def __init__(self, door_name=None):
super(TangoMacroExecutor, self).__init__()
if door_name == None:
- door_name = DOOR_NAME
+ door_name = getattr(sardanacustomsettings,'UNITTEST_DOOR_NAME')
self._door = PyTango.DeviceProxy(door_name)
self._done_event = None
self._started_event = None
@@ -207,5 +208,5 @@ def printLog(logs):
print line
if __name__ == '__main__':
- door_name = 'door/sardana_test/1'
+ door_name = getattr(sardanacustomsettings,'UNITTEST_DOOR_NAME')
testTangoMacroExecutorRunLsm(door_name)