From d59807a005c250d6e1e1d847daeba57a651a8205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CSae126V=E2=80=9D?= <“saitejav2021@gmail.com”> Date: Mon, 18 Sep 2023 14:42:38 +0000 Subject: [PATCH 1/3] [#238] Add storage record type for logger --- apel/db/loader/loader.py | 4 +++- test/test_loader.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apel/db/loader/loader.py b/apel/db/loader/loader.py index d4d05e20..b1d409bb 100644 --- a/apel/db/loader/loader.py +++ b/apel/db/loader/loader.py @@ -204,7 +204,9 @@ def load_msg(self, msg_text, signer): apel.db.records.sync.SyncRecord: 'Sync', apel.db.records.cloud.CloudRecord: 'Cloud', apel.db.records.cloud_summary.CloudSummaryRecord: - 'Cloud Summary'} + 'Cloud Summary', + apel.db.records.storage.StorageRecord: 'Storage', + } log.info('Loading message from %s', signer) diff --git a/test/test_loader.py b/test/test_loader.py index 0d9a5f6e..9c23efc2 100644 --- a/test/test_loader.py +++ b/test/test_loader.py @@ -178,7 +178,7 @@ def test_load_all_other_type(self): self.loader.load_all_msgs() self.mock_db.load_records.assert_called_once() mock_log.assert_has_calls( - [call('Message contains %i records', 1)]) + [call('Message contains 1 %s record', 'Storage')]) def tearDown(self): shutil.rmtree(self.dir_path) From e7fd983aea84e05b9a96c0300b9104c9dcdc2d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CSae126V=E2=80=9D?= <“saitejav2021@gmail.com”> Date: Mon, 18 Sep 2023 16:00:53 +0000 Subject: [PATCH 2/3] [#238] Rename method name in test loader --- test/test_loader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_loader.py b/test/test_loader.py index 9c23efc2..78e9b6d3 100644 --- a/test/test_loader.py +++ b/test/test_loader.py @@ -143,8 +143,9 @@ def test_load_all_single_record(self): mock_log.assert_has_calls( [call('Message contains 1 %s record', 'Summary')]) - def test_load_all_other_type(self): - """Check that load_records is called and message is logged correctly when type is other""" + def test_load_all_storage_type(self): + """Check that load_records is called and message is logged + correctly when record type is storage""" logger = logging.getLogger('loader') pidfile = os.path.join(self.dir_path, 'pidfile') From ef13637dd5e851dc73a3dbad1d5b3c56c6890c4e Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Tue, 17 Sep 2024 11:51:03 +0100 Subject: [PATCH 3/3] Reflow dict and improve test case docstring --- apel/db/loader/loader.py | 18 ++++++++---------- test/test_loader.py | 6 ++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apel/db/loader/loader.py b/apel/db/loader/loader.py index b1d409bb..1db42e7c 100644 --- a/apel/db/loader/loader.py +++ b/apel/db/loader/loader.py @@ -197,16 +197,14 @@ def load_msg(self, msg_text, signer): from its text content into the database. ''' record_types = { - apel.db.records.summary.SummaryRecord: 'Summary', - apel.db.records.job.JobRecord: 'Job', - apel.db.records.normalised_summary.NormalisedSummaryRecord: - 'Normalised Summary', - apel.db.records.sync.SyncRecord: 'Sync', - apel.db.records.cloud.CloudRecord: 'Cloud', - apel.db.records.cloud_summary.CloudSummaryRecord: - 'Cloud Summary', - apel.db.records.storage.StorageRecord: 'Storage', - } + apel.db.records.summary.SummaryRecord: 'Summary', + apel.db.records.job.JobRecord: 'Job', + apel.db.records.normalised_summary.NormalisedSummaryRecord: 'Normalised Summary', + apel.db.records.sync.SyncRecord: 'Sync', + apel.db.records.cloud.CloudRecord: 'Cloud', + apel.db.records.cloud_summary.CloudSummaryRecord: 'Cloud Summary', + apel.db.records.storage.StorageRecord: 'Storage', + } log.info('Loading message from %s', signer) diff --git a/test/test_loader.py b/test/test_loader.py index 78e9b6d3..c1b977fa 100644 --- a/test/test_loader.py +++ b/test/test_loader.py @@ -144,8 +144,10 @@ def test_load_all_single_record(self): [call('Message contains 1 %s record', 'Summary')]) def test_load_all_storage_type(self): - """Check that load_records is called and message is logged - correctly when record type is storage""" + """Check that load_records calls and logs with storage records. + + This checks that load_records is called and the message is logged + correctly when the record type is storage.""" logger = logging.getLogger('loader') pidfile = os.path.join(self.dir_path, 'pidfile')