From cd0cda0f6888e37fbb0b11f51363f45cb93d1e8d Mon Sep 17 00:00:00 2001 From: szypulka Date: Thu, 19 Sep 2019 10:55:41 +0300 Subject: [PATCH 1/3] Fix tags with None for NeUploader --- yandextank/plugins/NeUploader/plugin.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yandextank/plugins/NeUploader/plugin.py b/yandextank/plugins/NeUploader/plugin.py index 3f566ef11..78d23b134 100644 --- a/yandextank/plugins/NeUploader/plugin.py +++ b/yandextank/plugins/NeUploader/plugin.py @@ -181,6 +181,9 @@ def map_uploader_tags(self, uploader_tags): return {} else: meta_tags_names = ['component', 'description', 'name', 'person', 'task', 'version', 'lunapark_jobno'] - meta_tags = {key: uploader_tags.get(key, self.cfg.get(key)) for key in meta_tags_names} - meta_tags.update({k: v for k, v in uploader_tags.get('meta', {}).items()}) + meta_tags = {key: uploader_tags.get(key, self.cfg.get(key, '')) for key in meta_tags_names} + for k, v in uploader_tags.get('meta', {}).items(): + if not v: + v = '' + meta_tags.update({k: v}) return meta_tags From a19e755b23ffd18443cc482212193b395657e2b2 Mon Sep 17 00:00:00 2001 From: szypulka Date: Thu, 19 Sep 2019 14:48:53 +0300 Subject: [PATCH 2/3] Fix empty meta for DataUploader --- yandextank/plugins/DataUploader/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yandextank/plugins/DataUploader/plugin.py b/yandextank/plugins/DataUploader/plugin.py index 0683cd462..75fec319c 100644 --- a/yandextank/plugins/DataUploader/plugin.py +++ b/yandextank/plugins/DataUploader/plugin.py @@ -557,7 +557,7 @@ def lp_job(self): self.core.publish(self.SECTION, 'person', self._lp_job.person) self.core.publish(self.SECTION, 'task', self._lp_job.task) self.core.publish(self.SECTION, 'version', self._lp_job.version) - self.core.publish(self.SECTION, 'meta', self.cfg.get('meta')) + self.core.publish(self.SECTION, 'meta', self.cfg.get('meta', {})) return self._lp_job From c310b0c019661c63d3f31280df176b24ae8351cc Mon Sep 17 00:00:00 2001 From: szypulka Date: Thu, 19 Sep 2019 15:02:53 +0300 Subject: [PATCH 3/3] Explicit check for None in meta --- yandextank/plugins/NeUploader/plugin.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/yandextank/plugins/NeUploader/plugin.py b/yandextank/plugins/NeUploader/plugin.py index 78d23b134..bbd853c05 100644 --- a/yandextank/plugins/NeUploader/plugin.py +++ b/yandextank/plugins/NeUploader/plugin.py @@ -182,8 +182,5 @@ def map_uploader_tags(self, uploader_tags): else: meta_tags_names = ['component', 'description', 'name', 'person', 'task', 'version', 'lunapark_jobno'] meta_tags = {key: uploader_tags.get(key, self.cfg.get(key, '')) for key in meta_tags_names} - for k, v in uploader_tags.get('meta', {}).items(): - if not v: - v = '' - meta_tags.update({k: v}) + meta_tags.update({k: v if v is not None else '' for k, v in uploader_tags.get('meta', {}).items()}) return meta_tags