Re: HTTPS broken by commit of https://bz.apache.org/bugzilla/show_bug.cgi?id=58099

2016-02-18 Thread Felix Schumacher 


Am 19. Februar 2016 00:47:04 MEZ, schrieb Philippe Mouawad 
:
>Hi,
>I added the tests and now issue is detected.
>I commited the fix to Bug 58099 fixing regression.

There is another bug open, to remove all references to apache.org.

Could we start a local server with sni enabled ssl connector? 

>
>But I think next test will still fail due to this in logs:
>WARN  - jmeter.util.SSLManager: Keystore file not found, loading empty
>keystore
>
>What shall we do about that ?

Fill the used truststore with the necessary keys, or use one, that accepts any 
certificate? 

Regards, 
Felix 

>Regards
>Philippe
>
>On Fri, Feb 19, 2016 at 12:18 AM, Philippe Mouawad <
>philippe.moua...@gmail.com> wrote:
>
>> Hello,
>> I broke HTTPS in JMeter with commit 1730947.
>>
>> I will fix it in few minutes.
>>
>> But it is strange that no JUnit test caught this big issue.
>>
>> I will commit a Test Plan testing HTTPS and SNI.
>>
>> --
>> Regards.
>> Philippe M.
>>

Jenkins build is back to normal : JMeter-trunk #4971

2016-02-18 Thread Apache Jenkins Server 
See

buildbot failure in on jmeter-trunk

2016-02-18 Thread buildbot 
The Buildbot has detected a new failure on builder jmeter-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/jmeter-trunk/builds/636

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: hemera_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-jmeter-commit' 
triggered this build
Build Source Stamp: [branch jmeter/trunk] 1731172
Blamelist: pmouawad

BUILD FAILED: failed shell_3

Sincerely,
 -The Buildbot

Build failed in Jenkins: JMeter-trunk #4970

2016-02-18 Thread Apache Jenkins Server 
See 

--
[...truncated 903 lines...]
   [anakia] Output: 

   [anakia] Input:  usermanual/listeners.xml
   [anakia] Output: 

   [anakia] Input:  usermanual/realtime-results.xml
   [anakia] Output: 

   [anakia] Input:  usermanual/regular_expressions.xml
   [anakia] Output: 

   [anakia] Input:  usermanual/remote-test.xml
   [anakia] Output: 

   [anakia] Input:  usermanual/test_plan.xml
   [anakia] Output: 

 [echo] Fixing EOL
 [echo] Removing unnecessary  tags
 [echo] Copying files
 [copy] Copying 16 files to 

 [copy] Copying 5 files to 

 [copy] Copying 1 file to 


pack-nightly:

_pack-binaries:
  [tar] Building tar: 

 [gzip] Building: 

   [delete] Deleting: 

  [zip] Building zip: 


_pack-libraries:
  [tar] Building tar: 

 [gzip] Building: 

   [delete] Deleting: 

  [zip] Building zip: 


_pack-source:
  [tar] Building tar: 

 [gzip] Building: 

   [delete] Deleting: 

  [zip] Building zip: 


nightly:

compile-tests:
[javac] Compiling 124 source files to 

[javac] Note: 

 uses or overrides a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.

_test:
 [echo] 
 [echo]gump.run = false
 [echo]java.awt.headless = true
 [echo]test.headless = true
 [echo]user.dir = 
 [echo]basedir = 
 [echo]test dir = build/test
 [echo]test dir gump = build/test
 [echo]testsaveservice.saveout = ${testsaveservice.saveout}
 [echo]test.encoding = UTF-8
 [echo]
 [java] Setting JMeterHome: 

 [java] Setting up logging props using file: 

 [java] Writing log file 
to:
 [java] Using initializeProperties() from org.apache.jmeter.util.JMeterUtils
 [java] Setting up initial properties using: 

 [java] Initializing Properties: 

 [java] Writing log file 
to:
 [java] JMeterVersion=r1731172
 [java] java.version=1.7.0_80
 [java] 
java.home=/home/jenkins/jenkins-slave/tools/hudson.model.JDK/latest1.7/jre
 [java] file.encoding=UTF-8
 [java] default encoding=UTF-8
 [java]

Build failed in Jenkins: JMeter-trunk #4969

2016-02-18 Thread Apache Jenkins Server 
See 

Changes:

[pmouawad] Bug 58099 - Performance : Lazily initialize HttpClient SSL Context 
to avoid its initialization even for HTTP only scenarios
Fix regression on HTTPS tests, No route to host...
Bugzilla Id: 58099

--
[...truncated 965 lines...]
   [anakia] Output: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/usermanual/ldapops_tutor.html
   [anakia] Input:  usermanual/listeners.xml
   [anakia] Output: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/usermanual/listeners.html
   [anakia] Input:  usermanual/realtime-results.xml
   [anakia] Output: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/usermanual/realtime-results.html
   [anakia] Input:  usermanual/regular_expressions.xml
   [anakia] Output: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/usermanual/regular_expressions.html
   [anakia] Input:  usermanual/remote-test.xml
   [anakia] Output: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/usermanual/remote-test.html
   [anakia] Input:  usermanual/test_plan.xml
   [anakia] Output: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/usermanual/test_plan.html
 [echo] Fixing EOL
 [echo] Removing unnecessary  tags
 [echo] Copying files
 [copy] Copying 16 files to 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/demos
 [copy] Copying 5 files to 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/usermanual
 [copy] Copying 1 file to 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/printable_docs/extending

pack-nightly:

_pack-binaries:
  [tar] Building tar: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_bin.tar
 [gzip] Building: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_bin.tgz
   [delete] Deleting: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_bin.tar
  [zip] Building zip: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_bin.zip

_pack-libraries:
  [tar] Building tar: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_lib.tar
 [gzip] Building: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_lib.tgz
   [delete] Deleting: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_lib.tar
  [zip] Building zip: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_lib.zip

_pack-source:
  [tar] Building tar: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_src.tar
 [gzip] Building: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_src.tgz
   [delete] Deleting: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_src.tar
  [zip] Building zip: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/dist/apache-jmeter-r1731172_src.zip

nightly:

compile-tests:
[javac] Compiling 124 source files to 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/build/test
[javac] Note: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
 uses or overrides a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.

_test:
 [echo] 
 [echo]gump.run = false
 [echo]java.awt.headless = true
 [echo]test.headless = true
 [echo]user.dir = /x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk
 [echo]basedir = /x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk
 [echo]test dir = build/test
 [echo]test dir gump = build/test
 [echo]testsaveservice.saveout = ${testsaveservice.saveout}
 [echo]test.encoding = UTF-8
 [echo]
 [java] Setting JMeterHome: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk
 [java] Setting up logging props using file: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/bin/testfiles/jmetertest.properties
 [java] Writing log file 
to:/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/bin/jmeter-test.log
 [java] Using initializeProperties() from org.apache.jmeter.util.JMeterUtils
 [java] Setting up initial properties using: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/bin/testfiles/jmetertest.properties
 [java] Initializing Properties: 
/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/bin/testfiles/jmetertest.properties
 [java] Writing log file 
to:/x1/jenkins/jenkins-slave/workspace/JMeter-trunk/trunk/bin/jmeter-test.log
 [java] JMeterVersion=r1731172
 [java] java.version=1.7.0_80
 [java]

HTTPS broken by commit of https://bz.apache.org/bugzilla/show_bug.cgi?id=58099

2016-02-18 Thread Philippe Mouawad 
Hello,
I broke HTTPS in JMeter with commit 1730947.

I will fix it in few minutes.

But it is strange that no JUnit test caught this big issue.

I will commit a Test Plan testing HTTPS and SNI.

-- 
Regards.
Philippe M.

Re: svn commit: r1731062 - in /jmeter/trunk/src: core/org/apache/jmeter/gui/util/JMeterToolBar.java core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java jorphan/org/a

2016-02-18 Thread sebb 
On 18 February 2016 at 12:56,   wrote:
> Author: pmouawad
> Date: Thu Feb 18 12:56:21 2016
> New Revision: 1731062
>
> URL: http://svn.apache.org/viewvc?rev=1731062=rev
> Log:
> #resolve #123

That does not say why the changes were committed; please ensure that
the commit message has sufficient information for the reader to
understand the commit.

> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
> 
> jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
> jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java?rev=1731062=1731061=1731062=diff
> ==
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java 
> (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java Thu 
> Feb 18 12:56:21 2016
> @@ -218,21 +218,19 @@ public class JMeterToolBar extends JTool
>   * Init the state of buttons
>   */
>  public void initButtonsState() {
> -final boolean started = false;
>  Map buttonStates = new HashMap<>();
> -buttonStates.put(ActionNames.ACTION_START, 
> Boolean.valueOf(!started));
> -buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, 
> Boolean.valueOf(!started));
> -buttonStates.put(ActionNames.ACTION_STOP, Boolean.valueOf(started));
> -buttonStates.put(ActionNames.ACTION_SHUTDOWN, 
> Boolean.valueOf(started));
> +buttonStates.put(ActionNames.ACTION_START, Boolean.TRUE);
> +buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, Boolean.TRUE);
> +buttonStates.put(ActionNames.ACTION_STOP, Boolean.FALSE);
> +buttonStates.put(ActionNames.ACTION_SHUTDOWN, Boolean.FALSE);
>  buttonStates.put(ActionNames.UNDO, Boolean.FALSE);
>  buttonStates.put(ActionNames.REDO, Boolean.FALSE);
> -buttonStates.put(ActionNames.REMOTE_START_ALL, 
> Boolean.valueOf(!started));
> -buttonStates.put(ActionNames.REMOTE_STOP_ALL, 
> Boolean.valueOf(started));
> -buttonStates.put(ActionNames.REMOTE_SHUT_ALL, 
> Boolean.valueOf(started));
> +buttonStates.put(ActionNames.REMOTE_START_ALL, Boolean.TRUE);
> +buttonStates.put(ActionNames.REMOTE_STOP_ALL, Boolean.FALSE);
> +buttonStates.put(ActionNames.REMOTE_SHUT_ALL, Boolean.FALSE);
>  updateButtons(buttonStates);
>  }
>
> -
>  /**
>   * Change state of buttons on local test
>   *
>
> Modified: 
> jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java?rev=1731062=1731061=1731062=diff
> ==
> --- 
> jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
>  (original)
> +++ 
> jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
>  Thu Feb 18 12:56:21 2016
> @@ -280,11 +280,10 @@ public abstract class AbstractVersusRequ
>  File tmpFile = File.createTempFile(parent.getName(), "-"
>  + String.valueOf(i), workDir);
>  tmpFile.deleteOnExit();
> -fileInfos
> -.add(new FileInfo(tmpFile, 
> getConsumedMetadata(i)));
> +fileInfos.add(new FileInfo(tmpFile, 
> getConsumedMetadata(i)));
>  } catch (IOException ex) {
>  String message = String.format(
> -"Cannot create temporary file for channel #%s", 
> Integer.toString(i));
> +"Cannot create temporary file for channel #%d", 
> i);
>  log.error(message, ex);
>  throw new SampleException(message, ex);
>  }
>
> Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1731062=1731061=1731062=diff
> ==
> --- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java 
> (original)
> +++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Thu 
> Feb 18 12:56:21 2016
> @@ -570,9 +570,10 @@ public final class JOrphanUtils {
>
>  /**
>   * @param elapsedSec long elapsed time in seconds
> - * @return String formated with format HH:mm:ss
> + * @return String formatted

[GitHub] jmeter pull request: Bug 59028 : use the SystemDefaultDnsResolver ...

2016-02-18 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/jmeter/pull/130


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Refactored addKeyData in AbstractGraphConsume...

2016-02-18 Thread ham1 
Github user ham1 commented on the pull request:

https://github.com/apache/jmeter/pull/129#issuecomment-185733398
  
@pmouawad Yes, you are correct. Good spot. I will try again and also try to 
keep formatting separate from changes - would 2 commits on the same PR be 
preferred or just 2 PRs for formatting and code change?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Refactored addKeyData in AbstractGraphConsume...

2016-02-18 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/jmeter/pull/129


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Refactored addKeyData in AbstractGraphConsume...

2016-02-18 Thread pmouawad 
Github user pmouawad commented on the pull request:

https://github.com/apache/jmeter/pull/129#issuecomment-185728403
  
Hello,
I think there is an issue with your refactoring of AbstractGraphConsumer.
at lines 341 to 351, you have refactored the Map iteration but:
1) One contains:
`
coordResult.addResult(new ValueResultData(
Double.valueOf(percentile)));
coordResult.addResult(new ValueResultData(value));
`
2/ The other one contains:

`coordResult.addResult(new ValueResultData(value));
coordResult.addResult(new ValueResultData(
Double.valueOf(percentile)));`


So unless I am missing something I don't think it is ok.

Besides, I prefer not to mix formatting with refactoring.
I will only include formatting from this PR.
Thanks


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Removing unnecessary modifiers

2016-02-18 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/jmeter/pull/122


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Removing duplicate code.

2016-02-18 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/jmeter/pull/126


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Removing unnecessary (un)boxing

2016-02-18 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/jmeter/pull/123


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Minimum height for TableEditor widget

2016-02-18 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/jmeter/pull/128


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Refactored addKeyData in AbstractGraphConsume...

2016-02-18 Thread ham1 
GitHub user ham1 opened a pull request:

https://github.com/apache/jmeter/pull/129

Refactored addKeyData in AbstractGraphConsumer and other minor formatting 

Mainly removing duplicate code and renaming things to make it easier to 
understand.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/ham1/jmeter refactor_and_reformat

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/jmeter/pull/129.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #129


commit ae13c78bfa38621c46987d524b2224f219aa0a4d
Author: Graham Russell 
Date:   2016-02-17T22:56:31Z

Refactored addKeyData in AbstractGraphConsumer and other minor formatting




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request: Minimum height for TableEditor widget

2016-02-18 Thread vherilier 
GitHub user vherilier opened a pull request:

https://github.com/apache/jmeter/pull/128

Minimum height for TableEditor widget

BugzillaId #58870: Set a minimum height for TableEditor widget when the 
element screen, that contains a such widgget, has its size is reduced, not to 
reduce the widget's height only to its headers row height

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/vherilier/jmeter TableEditorMinimumHeight

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/jmeter/pull/128.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #128


commit e16b35352a94e92cea9254315f7eb83eb6cbdced
Author: Vincent Herilier 
Date:   2016-02-18T10:29:01Z

Set a minimum height for TableEditor widget when the element screen size is 
reduced, not to reduce its own height only to its headers row height




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---