better order of accessibles: 'value' 'status' and 'target' first
- predefined parameters/commands appear first, in the order defined in frappy.params.PREDEFINED_ACCESSIBLES - other (custom) parameters by inheritance order - remove paramOrder attribute (not used currently) Change-Id: If4c43189e4837dba057dc0a430ac6c3d1ae10829 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34904 Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch> Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
This commit is contained in:
@ -141,12 +141,10 @@ def test_ModuleMagic():
|
||||
|
||||
|
||||
# first inherited accessibles
|
||||
sortcheck1 = ['value', 'status', 'pollinterval', 'target', 'stop',
|
||||
'param1', 'param2', 'cmd', 'a1', 'a2', 'cmd2']
|
||||
sortcheck1 = ['value', 'status', 'target', 'pollinterval', 'stop',
|
||||
'param1', 'param2', 'cmd', 'a1', 'a2', 'cmd2']
|
||||
|
||||
class Newclass2(Newclass1):
|
||||
paramOrder = 'param1', 'param2', 'cmd', 'value'
|
||||
|
||||
@Command(description='another stuff')
|
||||
def cmd2(self, arg):
|
||||
return arg
|
||||
@ -171,9 +169,9 @@ def test_ModuleMagic():
|
||||
def read_value(self):
|
||||
return 0
|
||||
|
||||
# first inherited items not mentioned, then the ones mentioned in paramOrder, then the other new ones
|
||||
sortcheck2 = ['status', 'pollinterval', 'target', 'stop',
|
||||
'a1', 'a2', 'cmd2', 'param1', 'param2', 'cmd', 'value', 'b2']
|
||||
# first predefined parameters, then in the order of inheritance
|
||||
sortcheck2 = ['value', 'status', 'target', 'pollinterval', 'stop',
|
||||
'param1', 'param2', 'cmd', 'a1', 'a2', 'cmd2', 'b2']
|
||||
|
||||
updates = {}
|
||||
srv = ServerStub(updates)
|
||||
|
Reference in New Issue
Block a user