Merge pull request #568 from fomars/develop

validator fix for null defaults

Dockerfile-test

@@ -0,0 +1,9 @@
+FROM ubuntu:16.04
+WORKDIR /yandextank
+RUN apt-get update && \
+    apt-get install -y python-pip
+RUN pip install --upgrade setuptools
+RUN pip install --upgrade pip
+RUN pip install pytest
+CMD pip install . && pytest -s
+# docker run -v /path/to/yandextank:/yandextank --name my_container my_image

docs/config_reference.rst

@@ -392,12 +392,10 @@ DataUploader
 
 ``upload_token`` (string)
 -------------------------
-*\- Job's token. Use to upload data to an existing job. Requres jobno. Default:* ``None``
+*\- Job's token. Use to upload data to an existing job. Requres jobno.*
 
 :dependencies:
  jobno
-:nullable:
- True
 
 ``ver`` (string)
 ----------------

yandextank/aggregator/tests/test_test.py

@@ -6,7 +6,7 @@
 def test_random_split(data):
     dataframes = list(random_split(data))
     assert len(dataframes) > 1
-    concatinated = pd.concat(dataframes)
-    assert len(concatinated) == len(data), "We did not lose anything"
+    concatenated = pd.concat(dataframes)
+    assert len(concatenated) == len(data), "We did not lose anything"
     assert np.allclose(
-        concatinated.values, data.values), "We did not corrupt the data"
+        concatenated.values, data.values), "We did not corrupt the data"

yandextank/common/interfaces.py

@@ -59,10 +59,7 @@ def post_process(self, retcode):
 
     def get_option(self, option_name, default_value=None):
         """ Wrapper to get option from plugins' section """
-        option = self.cfg[option_name]
-        if option is None:
-            option = default_value
-        return option
+        return self.cfg.get(option_name, default_value)
 
     def get_available_options(self):
         """ returns array containing known options for plugin """

yandextank/plugins/DataUploader/config/schema.yaml

@@ -124,8 +124,6 @@ token_file:
 upload_token:
   description: Job's token. Use to upload data to an existing job. Requres jobno.
   type: string
-  nullable: true
-  default: null
   dependencies: jobno
 ver:
   description: version of the software tested