From commits-return-7471-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Mon Apr 10 15:08:06 2017 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8512619B09 for ; Mon, 10 Apr 2017 15:08:06 +0000 (UTC) Received: (qmail 40778 invoked by uid 500); 10 Apr 2017 15:08:06 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 40748 invoked by uid 500); 10 Apr 2017 15:08:06 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 40736 invoked by uid 99); 10 Apr 2017 15:08:06 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Apr 2017 15:08:06 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E03783A0597 for ; Mon, 10 Apr 2017 15:08:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1790849 - /jmeter/trunk/bin/testfiles/TestSchedulerWithTimer.jmx Date: Mon, 10 Apr 2017 15:08:05 -0000 To: commits@jmeter.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170410150805.E03783A0597@svn01-us-west.apache.org> Author: sebb Date: Mon Apr 10 15:08:05 2017 New Revision: 1790849 URL: http://svn.apache.org/viewvc?rev=1790849&view=rev Log: A bit more leeway for the test to complete If the cancellation did not work, the test would take much longer, so errors should still be caught Modified: jmeter/trunk/bin/testfiles/TestSchedulerWithTimer.jmx Modified: jmeter/trunk/bin/testfiles/TestSchedulerWithTimer.jmx URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TestSchedulerWithTimer.jmx?rev=1790849&r1=1790848&r2=1790849&view=diff ============================================================================== --- jmeter/trunk/bin/testfiles/TestSchedulerWithTimer.jmx (original) +++ jmeter/trunk/bin/testfiles/TestSchedulerWithTimer.jmx Mon Apr 10 15:08:05 2017 @@ -2,7 +2,7 @@ - Each Thread Group should initially end after 20s but since scheduler is set to 5s, we check it ends within 5.7s. Tests for Bugs 60797 and 60049 + Each Thread Group should initially end after 20s but since scheduler is set to 5s, we check it ends within 6s. Tests for Bugs 60797 and 60049 false false @@ -170,7 +170,7 @@ 7b043ed3-cbc5-4b9c-8427-8c70e6791c07 long start = Long.parseLong(props.get("TEST_START")); long duration = System.currentTimeMillis() - start; -long maxDurationPlusMargin = vars["MaxDuration"].toInteger()*1000+700; +long maxDurationPlusMargin = vars["MaxDuration"].toInteger()*1000+1000; if(duration> maxDurationPlusMargin) { SampleResult.setSuccessful(false); SampleResult.setResponseData("Duration "+duration+" exceeded expected duration of "+maxDurationPlusMargin);