jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1807170 - in /jmeter/trunk: bin/testfiles/TEST_HTTPS.jmx bin/testfiles/TEST_HTTPS.xml build.xml
Date Sun, 03 Sep 2017 21:12:29 GMT
Author: pmouawad
Date: Sun Sep  3 21:12:28 2017
New Revision: 1807170

URL: http://svn.apache.org/viewvc?rev=1807170&view=rev
Log:
Re enable TEST_HTTPS for SNI tests using https://analytics.usa.gov/ which uses SNI

Modified:
    jmeter/trunk/bin/testfiles/TEST_HTTPS.jmx
    jmeter/trunk/bin/testfiles/TEST_HTTPS.xml
    jmeter/trunk/build.xml

Modified: jmeter/trunk/bin/testfiles/TEST_HTTPS.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTPS.jmx?rev=1807170&r1=1807169&r2=1807170&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTPS.jmx (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTPS.jmx Sun Sep  3 21:12:28 2017
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="2.9" jmeter="3.0-SNAPSHOT.20160218">
+<jmeterTestPlan version="1.2" properties="3.2" jmeter="3.3-SNAPSHOT.20170903">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -30,10 +30,8 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel"
testclass="Arguments" testname="Variables pré-définies" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">sni.velox.ch</stringProp>
+          <stringProp name="HTTPSampler.domain">analytics.usa.gov</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
           <stringProp name="HTTPSampler.path"></stringProp>
@@ -42,22 +40,31 @@
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
           <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
           <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
         </HTTPSamplerProxy>
         <hashTree>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="RA_CHECK_SNI_OK"
enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="-1994161812">Great! Your client</stringProp>
-              <stringProp name="1060051536">&lt;p&gt;In your request, this
header was included:&lt;/p&gt;</stringProp>
-              <stringProp name="2056795296">&lt;pre&gt;  Host: sni.velox.ch&lt;/pre&gt;</stringProp>
+              <stringProp name="1071695892">&lt;meta property=&quot;og:title&quot;
content=&quot;analytics.usa.gov | The US government&apos;s web traffic.&quot;
/&gt;</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
             <intProp name="Assertion.test_type">16</intProp>
           </ResponseAssertion>
           <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="RA_NO_HANDSHAKE_ERROR"
enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="914337881">javax.net.ssl.SSLHandshakeException</stringProp>
+              <stringProp name="-1453429438">handshake_failure</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">20</intProp>
+          </ResponseAssertion>
+          <hashTree/>
         </hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTPS-Request"
enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel"
testclass="Arguments" testname="Variables pré-définies" enabled="true">
@@ -65,8 +72,6 @@
           </elementProp>
           <stringProp name="HTTPSampler.domain">www.apache.org</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
-          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-          <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
           <stringProp name="HTTPSampler.path"></stringProp>
@@ -75,8 +80,9 @@
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
           <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
           <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
         </HTTPSamplerProxy>
         <hashTree/>
       </hashTree>
@@ -180,5 +186,9 @@
       </ResultCollector>
       <hashTree/>
     </hashTree>
+    <WorkBench guiclass="WorkBenchGui" testclass="WorkBench" testname="WorkBench" enabled="true">
+      <boolProp name="WorkBench.save">true</boolProp>
+    </WorkBench>
+    <hashTree/>
   </hashTree>
 </jmeterTestPlan>

Modified: jmeter/trunk/bin/testfiles/TEST_HTTPS.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTPS.xml?rev=1807170&r1=1807169&r2=1807170&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTPS.xml (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTPS.xml Sun Sep  3 21:12:28 2017
@@ -6,6 +6,11 @@
     <failure>false</failure>
     <error>false</error>
   </assertionResult>
+  <assertionResult>
+    <name>RA_NO_HANDSHAKE_ERROR</name>
+    <failure>false</failure>
+    <error>false</error>
+  </assertionResult>
 </httpSample>
 <httpSample s="true" lb="HTTPS-Request" rc="200" rm="OK" tn="Thread Group 1-1" dt="text"
sc="1" ec="0" ng="1" na="1"/>
 

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1807170&r1=1807169&r2=1807170&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Sep  3 21:12:28 2017
@@ -124,7 +124,7 @@
   <property name="skip.batchtest_SlowCharsFeature" value="false" />
   <property name="skip.batchtest_TestKeepAlive" value="false" />
   <property name="skip.batchtest_ResponseDecompression" value="false" />
-  <property name="skip.test_https" value="true" />
+  <property name="skip.test_https" value="false" />
   <property name="skip.test_http" value="false" />
   <property name="skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server" value="false"
/>
 



Mime
View raw message