diff --git a/.gitattributes b/.gitattributes index 0104140749993ad1bb25804be5d8fef8be46edc0..f37db444339fdd94d39ff075699f3ff1913c93ff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1771,8 +1771,6 @@ LCU/Firmware/tools/src/view_images.sh -text LCU/Maintenance/CMakeLists.txt -text LCU/Maintenance/DBInterface/CMakeLists.txt -text LCU/Maintenance/DBInterface/__init__.py -text -LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/lastfailed -text -LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/nodeids -text LCU/Maintenance/DBInterface/django_postgresql/__init__.py -text LCU/Maintenance/DBInterface/django_postgresql/create_db.sql -text LCU/Maintenance/DBInterface/django_postgresql/settings.py -text @@ -1810,8 +1808,6 @@ LCU/Maintenance/DBInterface/monitoringdb/serializers/stationtest.py -text LCU/Maintenance/DBInterface/monitoringdb/serializers/tbberrorserializer.py -text LCU/Maintenance/DBInterface/monitoringdb/serializers/tileerror.py -text LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py -text -LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/lastfailed -text -LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/nodeids -text LCU/Maintenance/DBInterface/monitoringdb/tests/__init__.py -text LCU/Maintenance/DBInterface/monitoringdb/tests/common.py -text LCU/Maintenance/DBInterface/monitoringdb/tests/old_tests.py -text diff --git a/LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/lastfailed b/LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/lastfailed deleted file mode 100644 index f00cf7b07c8210de57f4b16decf00ff7e73347fa..0000000000000000000000000000000000000000 --- a/LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/lastfailed +++ /dev/null @@ -1,4 +0,0 @@ -{ - "monitoringdb/tests/t_stationtest_parser.py::TestStationTestsParser": true, - "monitoringdb/tests/t_stationtest_parser.py::TestStationTestsParser::()::test_parsing_one_test": true -} \ No newline at end of file diff --git a/LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/nodeids b/LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/nodeids deleted file mode 100644 index 81039ce4bfa0f664b64f95d86a4692561bd7c6e7..0000000000000000000000000000000000000000 --- a/LCU/Maintenance/DBInterface/django_postgresql/.pytest_cache/v/cache/nodeids +++ /dev/null @@ -1,5 +0,0 @@ -[ - "monitoringdb/tests/t_stationtest_parser.py::TestStationTestsParser::test_all_test_dict_parsing", - "monitoringdb/tests/t_stationtest_parser.py::TestStationTestsParser::test_component_to_dict_parsing", - "monitoringdb/tests/t_stationtest_parser.py::TestStationTestsParser::test_parsing_one_test" -] \ No newline at end of file diff --git a/LCU/Maintenance/DBInterface/monitoringdb/rtsm_test_raw_parser.py b/LCU/Maintenance/DBInterface/monitoringdb/rtsm_test_raw_parser.py index 4bbfb9be48bffbd9e9aa7f8a4325298033a866ce..132b355b3a70fe0ce45c9eec333a02306b08cba4 100644 --- a/LCU/Maintenance/DBInterface/monitoringdb/rtsm_test_raw_parser.py +++ b/LCU/Maintenance/DBInterface/monitoringdb/rtsm_test_raw_parser.py @@ -26,6 +26,11 @@ def parse_data(date_time): def preparse_rtsm_test_file(content): + """ + Parse the content of the RTSM output into a dict representation + :param content: + :return: + """ results = [] result = dict() observation = dict() diff --git a/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py b/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py index b6be6c0f92131603077227bb773bb2798dbf83fe..d815692faba1fddc883d44011b1f814a5c10285f 100644 --- a/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py +++ b/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py @@ -147,11 +147,9 @@ def dict_from_tbb_component_error(content): def dict_from_hba_component_error(content): - component_type = content[1] error_type = content[3] extra_args = content[4:] result = dict(tile_errors=[]) - resourcetype = 'HBAComponentError' translate = dict(x='signalX', y='signalY', xoff='signalX_offset', yoff='signalY_offset', xmean='mean_signalX', ymean='mean_signalY', proc='percentage', val='value', diff='fluctuation', ref='limit') @@ -435,6 +433,11 @@ def dict_from_raw_station_test(content): def dicts_from_tile_error(contents): + """ + Parses the content into a dict that represents the tile error's data + :param contents: + :return: + """ results = list() key_pattern = "([^XY0-9]{0,3})([X,Y]{0,1})([0-9]{1,3})" for tile_error in contents: diff --git a/LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/lastfailed b/LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/lastfailed deleted file mode 100644 index b9292b8c1882eab25b266cdc6c8938b766d0357b..0000000000000000000000000000000000000000 --- a/LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/lastfailed +++ /dev/null @@ -1,4 +0,0 @@ -{ - "t_stationtest_parser.py": true, - "t_stationtest_parser.py::TestStationTestsParser::()::test_parsing_one_test": true -} \ No newline at end of file diff --git a/LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/nodeids b/LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/nodeids deleted file mode 100644 index e97b780eb132400f4df0235573fe5e473255462c..0000000000000000000000000000000000000000 --- a/LCU/Maintenance/DBInterface/monitoringdb/tests/.pytest_cache/v/cache/nodeids +++ /dev/null @@ -1,3 +0,0 @@ -[ - "t_stationtest_parser.py::TestStationTestsParser::()::test_parsing_one_test" -] \ No newline at end of file