Merge pull request #492 from fomars/develop

- tank hub
yandex · Jan 18, 2018 · 5768255 · 5768255
2 parents b8f86a4 + 128c092
commit 5768255
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 170 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='yandextank',
-    version='1.9.7',
+    version='1.9.8',
     description='a performance measurement tool',
     longer_description='''
 Yandex.Tank is a performance measurement and load testing automatization tool.

diff --git a/yandextank/aggregator/tank_aggregator.py b/yandextank/aggregator/tank_aggregator.py
@@ -54,6 +54,10 @@ def __init__(self, generator):
         self.stats = q.Queue()
         self.data_cache = {}
         self.stat_cache = {}
+        self.reader = None
+        self.stats_reader = None
+        self.drain = None
+        self.stats_drain = None
 
     def start_test(self):
         self.reader = self.generator.get_reader()

diff --git a/yandextank/common/interfaces.py b/yandextank/common/interfaces.py
@@ -218,3 +218,6 @@ def get_stats_reader(self):
         :rtype: collections.Iterable
         """
         pass
+
+    def end_test(self, retcode):
+        pass
diff --git a/yandextank/plugins/DataUploader/client.py b/yandextank/plugins/DataUploader/client.py
@@ -86,6 +86,7 @@ def __init__(self, request, response):
             super(self.__class__, self).__init__(self.message)
 
     class StoppedFromOnline(Exception):
+        """http code 410"""
         message = "Shooting is stopped from online"
 
     class JobNotCreated(Exception):

diff --git a/yandextank/tank-hub/Dockerfile b/yandextank/tank-hub/Dockerfile
diff --git a/yandextank/tank-hub/api.py b/yandextank/tank-hub/api.py
diff --git a/yandextank/tank-hub/api.yaml b/yandextank/tank-hub/api.yaml
diff --git a/yandextank/tank-hub/requirements.txt b/yandextank/tank-hub/requirements.txt
diff --git a/yandextank/tank-hub/run_locally.py b/yandextank/tank-hub/run_locally.py
diff --git a/yandextank/tank-hub/server.py b/yandextank/tank-hub/server.py
diff --git a/yandextank/tank-hub/uwsgi.ini b/yandextank/tank-hub/uwsgi.ini