diff --git a/yandex-tank.ini b/00-base.ini similarity index 100% rename from yandex-tank.ini rename to 00-base.ini diff --git a/Tank/Plugins/Phantom.py b/Tank/Plugins/Phantom.py index 0ed2d57..d3f7895 100644 --- a/Tank/Plugins/Phantom.py +++ b/Tank/Plugins/Phantom.py @@ -610,9 +610,7 @@ class PhantomConfig: elif self.answ_log_level == '1': self.answ_log_level = 'all' - if self.answ_log_level != 'none': - self.answ_log = self.owner.core.mkstemp(".log", "answ_") - + self.answ_log = self.owner.core.mkstemp(".log", "answ_") self.phout_file = self.owner.core.mkstemp(".log", "phout_") self.owner.core.add_artifact_file(self.phout_file) diff --git a/Tank/Plugins/Stepper.py b/Tank/Plugins/Stepper.py index 6d88e7f..79ad015 100644 --- a/Tank/Plugins/Stepper.py +++ b/Tank/Plugins/Stepper.py @@ -830,8 +830,7 @@ class Stepper: input_ammo = open(ammo_file, 'rb') stepped_ammo = open(self.stpd_file, 'wb') for step in load_steps: - if not (cur_progress / 100) % 2: - pbar.update(cur_progress) + pbar.update(cur_progress) if case == 3: if stop_loop_count > 0 and cur_progress == stop_loop_count: diff --git a/debian/changelog b/debian/changelog index d97bfb7..f523c7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yandex-load-tank-base (1.1.4) precise; urgency=low + + * fix file descriptor leaks + + -- Andrey Pohilko (undera) Mon, 22 Oct 2012 16:01:47 +0400 + yandex-load-tank-base (1.1.3) precise; urgency=high * fix bug with phantom timeout diff --git a/debian/install b/debian/install index 20b6e0d..c7cb9b9 100644 --- a/debian/install +++ b/debian/install @@ -3,4 +3,4 @@ tankcore.py usr/lib/yandex-tank tank.py usr/lib/yandex-tank *.sh usr/lib/yandex-tank -yandex-tank.ini etc/yandex-tank +00-base.ini etc/yandex-tank