diff --git a/00-base.ini b/00-base.ini index 29ff83c..598f58d 100644 --- a/00-base.ini +++ b/00-base.ini @@ -11,4 +11,5 @@ plugin_web=Tank/Plugins/WebOnline.py plugin_tips=Tank/Plugins/TipsAndTricks.py plugin_totalautostop=Tank/Plugins/TotalAutostop.py plugin_loadosophia=Tank/Plugins/Loadosophia.py -plugin_graphite=Tank/Plugins/GraphiteUploader.py \ No newline at end of file +plugin_graphite=Tank/Plugins/GraphiteUploader.py +plugin_rcassert=Tank/Plugins/RCAssert.py \ No newline at end of file diff --git a/Tank/Plugins/Aggregator.py b/Tank/Plugins/Aggregator.py index 290cf1a..9fe7e85 100644 --- a/Tank/Plugins/Aggregator.py +++ b/Tank/Plugins/Aggregator.py @@ -306,11 +306,12 @@ class AbstractReader: def __append_sample(self, result, item): ''' add single sample to aggregator buffer ''' - (marker, threads, overall_rt, http_code, net_code, sent_bytes, received_bytes, connect, send, latency, receive, accuracy) = item - for check in [threads, overall_rt, sent_bytes, received_bytes, connect, send, latency, receive, accuracy]: + for check in item: if check < 0: self.log.error("Problem item: %s", item) raise ValueError("One of the sample items has negative value") + + (marker, threads, overall_rt, http_code, net_code, sent_bytes, received_bytes, connect, send, latency, receive, accuracy) = item result.case = marker result.active_threads = threads result.planned_requests = 0 diff --git a/Tank/Plugins/JMeter.py b/Tank/Plugins/JMeter.py index b04cc05..8b237df 100644 --- a/Tank/Plugins/JMeter.py +++ b/Tank/Plugins/JMeter.py @@ -15,8 +15,7 @@ import datetime class JMeterPlugin(AbstractPlugin): ''' JMeter tank plugin ''' - SECTION = 'jmeter' - + SECTION = 'jmeter' def __init__(self, core): AbstractPlugin.__init__(self, core) @@ -38,6 +37,7 @@ class JMeterPlugin(AbstractPlugin): def get_available_options(self): return ["jmx", "args", "jmeter_path", ] + def configure(self): self.original_jmx = self.get_option("jmx") self.core.add_artifact_file(self.original_jmx, True) diff --git a/debian/changelog b/debian/changelog index 2f3797a..fc9c28d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ yandex-load-tank-base (1.3.9) precise; urgency=low * add bash completion + * add support for Loadosophia.org active tests + * add RCAssert plugin - -- Andrey Pohilko (undera) Fri, 22 Mar 2013 17:55:21 +0400 + -- Andrey Pohilko (undera) Tue, 26 Mar 2013 19:43:07 +0400 yandex-load-tank-base (1.3.8) precise; urgency=low diff --git a/tankcore.py b/tankcore.py index 8c7c081..8fcf58c 100644 --- a/tankcore.py +++ b/tankcore.py @@ -327,7 +327,7 @@ class TankCore: plugin = self.__get_plugin_by_key(plugin_key) self.log.debug("Post-process %s", plugin) try: - plugin.post_process(retcode) + retcode=plugin.post_process(retcode) except Exception, ex: self.log.error("Failed post-processing plugin %s: %s", plugin, ex) self.log.debug("Failed post-processing plugin: %s", traceback.format_exc(ex))