Markus Zolliker b47e5d270c fix frappy.lib.merge_status ...

merge_status should consider that the status text in arguments
is already composed. add test for this.

Change-Id: Ia000d1e1d8e97a5c2b5ef9d1569cc123232016ae
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31378
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>

2023-06-28 11:49:38 +02:00

..

__init__.py

move path manipulation into single module

2018-12-04 10:54:59 +01:00

conftest.py

fixed pylint warnings

2022-11-09 17:19:17 +02:00

test_attach.py

Rename from secop to frappy

2022-11-09 16:29:29 +01:00

test_config.py

add test cases for server and config

2023-06-22 09:56:40 +02:00

test_datatypes.py

Fix lower limit checking of FloatRange

2023-05-09 08:49:41 +02:00

test_errors.py

improve error messages

2023-04-04 08:15:26 +02:00

test_handler.py

make return value 'Done' unneccessary

2023-03-20 14:31:56 +01:00

test_lib_enum.py

simplify status type declaration

2023-03-21 08:18:40 +01:00

test_lib.py

fix frappy.lib.merge_status

2023-06-28 11:49:38 +02:00

test_logging.py

Rename from secop to frappy

2022-11-09 16:29:29 +01:00

test_modules.py

Add influences property to parameters/commands

2023-05-31 09:14:18 +02:00

test_msg.py

Rename from secop to frappy

2022-11-09 16:29:29 +01:00

test_multievent.py

Rename from secop to frappy

2022-11-09 16:29:29 +01:00

test_params.py

make return value 'Done' unneccessary

2023-03-20 14:31:56 +01:00

test_parse.py

Rename from secop to frappy

2022-11-09 16:29:29 +01:00

test_persistent.py

improve persistent parameters

2023-01-24 15:35:50 +01:00

test_poller.py

make return value 'Done' unneccessary

2023-03-20 14:31:56 +01:00

test_properties.py

split BadValue into WrongType and RangeError

2023-03-16 07:51:13 +01:00

test_server.py

add test cases for server and config

2023-06-22 09:56:40 +02:00

test_statemachine.py

add a hook for reads to be done initially

2023-06-20 07:41:47 +02:00

test_status_members.py

remove UNKNOWN, UNSTABLE and DISABLED from Readable.status

2023-03-21 08:29:49 +01:00

test_test.py

Remove py2 support

2019-09-26 10:32:01 +02:00