Fix bug with false autostop

Tank/Plugins/Autostop.py

@@ -209,7 +209,7 @@ class HTTPCodesCriteria(AbstractCriteria):
             if aggregate_second.overall.RPS:
                 matched_responses = float(matched_responses) / aggregate_second.overall.RPS
             else:
-                matched_responses = 1
+                matched_responses = 0
         self.log.debug("HTTP codes matching mask %s: %s/%s", self.codes_mask, matched_responses, self.level)
         
         if matched_responses >= self.level:
@@ -276,7 +276,7 @@ class NetCodesCriteria(AbstractCriteria):
             if aggregate_second.overall.RPS:
                 matched_responses = float(matched_responses) / aggregate_second.overall.RPS
             else:
-                matched_responses = 1
+                matched_responses = 0
         self.log.debug("Net codes matching mask %s: %s/%s", self.codes_mask, matched_responses, self.level)
         
         if matched_responses >= self.level:

Tank/Plugins/JMeter.py

@@ -162,7 +162,6 @@ class JMeterReader(AbstractReader):
             return self.pop_second()
         else:
             return None 
-    
 
 
 class JMeterInfoWidget(AbstractInfoWidget, AggregateResultListener):

Tests/AutostopTest.py

@@ -81,6 +81,21 @@ class AutostopTestCase(TankTestCase):
             raise RuntimeError()
         self.foo.end_test(0)
 
+    def test_run_false_trigger_bug(self):
+        data = SecondAggregateData()
+        data.overall.http_codes = {}
+        self.foo.core.set_option(self.foo.SECTION, "autostop", "http (5xx, 100%, 1)")
+        
+        self.foo.configure()
+        self.foo.prepare_test()
+        
+        self.foo.start_test()
+        for n in range(1, 15):
+            self.foo.aggregate_second(data)
+        if self.foo.is_test_finished() >= 0:
+            raise RuntimeError()
+        self.foo.end_test(0)
+        
 if __name__ == '__main__':
     unittest.main()
 

Tests/data/15sec.jmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.2">
+<jmeterTestPlan version="1.2" properties="2.3">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -30,10 +30,10 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.domain">127.0.0.1</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+          <stringProp name="HTTPSampler.connect_timeout">100</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200</stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
           <stringProp name="HTTPSampler.path">/</stringProp>

debian/changelog

@@ -1,3 +1,10 @@
+yandex-load-tank-base (1.0.9) precise; urgency=low
+
+  * add ab functionality
+  * add JMeter functionality
+
+ -- Andrey Pohilko (undera) <undera@yandex-team.ru>  Tue, 25 Sep 2012 17:29:42 +0400
+
 yandex-load-tank-base (1.0.8) precise; urgency=low
 
   * change screen layout