Merge pull request #791 from szypulka/develop

Fix tags with None and Null for NeUploader
yandex · Sep 19, 2019 · 177f050 · 177f050
2 parents 11cd57f + c310b0c
commit 177f050
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
 

diff --git a/yandextank/plugins/NeUploader/plugin.py b/yandextank/plugins/NeUploader/plugin.py
@@ -184,6 +184,6 @@ 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}
+            meta_tags.update({k: v if v is not None else '' for k, v in uploader_tags.get('meta', {}).items()})
             return meta_tags