Merge pull request #647 from fomars/develop

version up, docs upd, option ignore_locks->ignore_lock
yandex · Sep 19, 2018 · fe124b0 · fe124b0
2 parents 814a316 + 015f6d0
commit fe124b0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 45 deletions.
diff --git a/docs/config_reference.rst b/docs/config_reference.rst
@@ -988,44 +988,4 @@ Telegraf
  ``10s``
   10 seconds
  ``2m``
-  2 minutes
-
-YASM
-====
-
-``panels`` (dict)
------------------
-*\- (no description).* **Required.**
-
-:valueschema:
- :schema:
-  :default_signals:
-   :default:
-    True
-   :type:
-    boolean
-  :host:
-   :required:
-    True
-   :type:
-    string
-  :signals:
-   :required:
-    False
-   :type:
-    list
-  :tags:
-   :required:
-    True
-   :type:
-    string
- :type:
-  dict
-
-``timeout`` (integer)
----------------------
-*\- (no description). Default:* ``120``
-
-``verbose_logging`` (boolean)
------------------------------
-*\- (no description). Default:* ``False``
+  2 minutes
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='yandextank',
-    version='1.10.2',
+    version='1.10.3',
     description='a performance measurement tool',
     longer_description='''
 Yandex.Tank is a performance measurement and load testing automatization tool.

diff --git a/yandextank/config_converter/converter.py b/yandextank/config_converter/converter.py
@@ -205,6 +205,9 @@ class Option(object):
         },
         'DataUploader': {
             'lock_targets': lambda k, v: {k: v.strip().split() if v != 'auto' else v}
+        },
+        'core': {
+            'ignore_locks': lambda k, v: {'ignore_lock': to_bool(v)}
         }
     }
     CONVERTERS_FOR_UNKNOWN = {
@@ -490,10 +493,10 @@ def core_options(cfg_ini):
 
 def convert_ini(ini_file):
     cfg_ini = ConfigParser()
-    if isinstance(ini_file, file):
-        cfg_ini.readfp(ini_file)
-    else:
+    if isinstance(ini_file, str):
         cfg_ini.read(ini_file)
+    else:
+        cfg_ini.readfp(ini_file)
 
     ready_sections = enable_sections(combine_sections(parse_sections(cfg_ini)), core_options(cfg_ini))
 

diff --git a/yandextank/config_converter/tests/test_config1.ini b/yandextank/config_converter/tests/test_config1.ini
@@ -6,6 +6,7 @@ plugin_autostop = Tank/Plugins/Autostop.py
 plugin_monitoring = Tank/Plugins/Telegraf.py
 plugin_uploader = Tank/Plugins/DataUploader.py
 artifacts_base_dir = logs
+ignore_locks = 1
 
 [phantom]
 address = load.example.net

diff --git a/yandextank/config_converter/tests/test_config1.yaml b/yandextank/config_converter/tests/test_config1.yaml
@@ -1,6 +1,7 @@
 core:
   lock_dir: /var/lock
   artifacts_base_dir: logs
+  ignore_lock: true
 phantom:
   package: yandextank.plugins.Phantom
   enabled: true