merge until "support write_ method on readonly param and more"
from gerrit Change-Id: I8d2ad2a381d3a37947d8afc5e17be0428d94df36
This commit is contained in:
@@ -75,4 +75,6 @@ def test_attach():
|
||||
assert m.propertyValues['att'] == 'a'
|
||||
srv.dispatcher.register_module(a, 'a')
|
||||
srv.dispatcher.register_module(m, 'm')
|
||||
assert m.att == 'a'
|
||||
m.attachedModules = {'att': a}
|
||||
assert m.att == a
|
||||
|
||||
@@ -64,6 +64,7 @@ def test_EnumMember():
|
||||
assert a != 3
|
||||
assert a == 1
|
||||
|
||||
|
||||
def test_Enum():
|
||||
e1 = Enum('e1')
|
||||
e2 = Enum('e2', e1, a=1, b=3)
|
||||
@@ -75,3 +76,4 @@ def test_Enum():
|
||||
assert e2.b > e3.a
|
||||
assert e3.c >= e2.a
|
||||
assert e3.b <= e2.b
|
||||
assert Enum({'self': 0, 'other': 1})('self') == 0
|
||||
|
||||
@@ -149,7 +149,7 @@ def test_ModuleMagic():
|
||||
a1 = Parameter(datatype=FloatRange(unit='$/s'), readonly=False)
|
||||
# remark: it might be a programming error to override the datatype
|
||||
# and not overriding the read_* method. This is not checked!
|
||||
b2 = Parameter('<b2>', datatype=BoolType(), default=True,
|
||||
b2 = Parameter('<b2>', datatype=StringType(), default='empty',
|
||||
readonly=False, initwrite=True)
|
||||
|
||||
def write_a1(self, value):
|
||||
@@ -157,6 +157,7 @@ def test_ModuleMagic():
|
||||
return value
|
||||
|
||||
def write_b2(self, value):
|
||||
value = value.upper()
|
||||
self._b2_written = value
|
||||
return value
|
||||
|
||||
@@ -211,11 +212,11 @@ def test_ModuleMagic():
|
||||
o2.startModule(event)
|
||||
event.wait()
|
||||
# value has changed type, b2 and a1 are written
|
||||
expectedAfterStart.update(value=0, b2=True, a1=True)
|
||||
expectedAfterStart.update(value=0, b2='EMPTY', a1=True)
|
||||
# ramerk: a1=True: this behaviour is a Porgamming error
|
||||
assert updates.pop('o2') == expectedAfterStart
|
||||
assert o2._a1_written == 2.7
|
||||
assert o2._b2_written is True
|
||||
assert o2._b2_written == 'EMPTY'
|
||||
|
||||
assert not updates
|
||||
|
||||
|
||||
Reference in New Issue
Block a user