Skip to content

Commit a7ad345

Browse files
author
admin
committed
fix legacy-2sv-bb
1 parent f43b3f2 commit a7ad345

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

app/jmeter/bitbucket.jmx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ log.info("GIT_LOG_DIR: " + gitLogDir);
254254
</JSR223PreProcessor>
255255
<hashTree/>
256256
</hashTree>
257-
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="if_os_is_not_windows" enabled="true">
257+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="if_os_is_not_windows">
258258
<stringProp name="IfController.condition">${__BeanShell(import org.apache.commons.lang3.SystemUtils; !SystemUtils.IS_OS_WINDOWS;)}</stringProp>
259259
<boolProp name="IfController.evaluateAll">false</boolProp>
260260
<boolProp name="IfController.useExpression">true</boolProp>
@@ -316,7 +316,7 @@ else{
316316
</elementProp>
317317
</HTTPSamplerProxy>
318318
<hashTree>
319-
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager">
319+
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
320320
<collectionProp name="HeaderManager.headers">
321321
<elementProp name="Accept-Language" elementType="Header">
322322
<stringProp name="Header.name">Accept-Language</stringProp>
@@ -341,7 +341,7 @@ else{
341341
</collectionProp>
342342
</HeaderManager>
343343
<hashTree/>
344-
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion">
344+
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
345345
<collectionProp name="Asserion.test_strings">
346346
<stringProp name="49586">200</stringProp>
347347
</collectionProp>
@@ -371,11 +371,11 @@ else{
371371
<stringProp name="script">String loginform = vars.get(&quot;loginform&quot;);
372372

373373
if (&quot;NOT_FOUND&quot;.equals(loginform)) {
374-
vars.put(&quot;legacy_login_form&quot;, &quot;false&quot;);
375-
log.info(&quot;2SVlogin flow detected&quot;);
376-
} else {
377374
vars.put(&quot;legacy_login_form&quot;, &quot;true&quot;);
378375
log.info(&quot;legacy login flow detected&quot;);
376+
} else {
377+
vars.put(&quot;legacy_login_form&quot;, &quot;false&quot;);
378+
log.info(&quot;2SVlogin flow detected&quot;);
379379
}
380380
</stringProp>
381381
</JSR223PostProcessor>
@@ -417,7 +417,7 @@ if (&quot;NOT_FOUND&quot;.equals(loginform)) {
417417
</elementProp>
418418
</HTTPSamplerProxy>
419419
<hashTree>
420-
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager">
420+
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
421421
<collectionProp name="HeaderManager.headers">
422422
<elementProp name="Content-Type" elementType="Header">
423423
<stringProp name="Header.name">Content-Type</stringProp>
@@ -438,7 +438,7 @@ if (&quot;NOT_FOUND&quot;.equals(loginform)) {
438438
<hashTree/>
439439
</hashTree>
440440
</hashTree>
441-
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="If legacy login flow" enabled="true">
441+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="If legacy login flow">
442442
<stringProp name="IfController.condition">${__groovy(vars.get(&quot;legacy_login_form&quot;) == &apos;true&apos;)}</stringProp>
443443
<boolProp name="IfController.evaluateAll">false</boolProp>
444444
<boolProp name="IfController.useExpression">true</boolProp>
@@ -470,7 +470,7 @@ if (&quot;NOT_FOUND&quot;.equals(loginform)) {
470470
</elementProp>
471471
</HTTPSamplerProxy>
472472
<hashTree>
473-
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
473+
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion">
474474
<collectionProp name="Asserion.test_strings">
475475
<stringProp name="49586">200</stringProp>
476476
</collectionProp>
@@ -524,7 +524,7 @@ vars.put(&quot;USER_SSH_KEY&quot;, new File(&apos;${__P(PRIVATE_SSH_KEY_LOCATION
524524
</stringProp>
525525
</JSR223Sampler>
526526
<hashTree/>
527-
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="if_ssh_key_not_present_on_server">
527+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="if_ssh_key_not_present_on_server" enabled="true">
528528
<stringProp name="IfController.condition">${__groovy(
529529
def userSshKey = vars.get(&quot;USER_SSH_KEY&quot;);
530530
def key_list = vars.get(&quot;SERVER_SSH_KEYS&quot;);
@@ -541,7 +541,7 @@ vars.put(&quot;USER_SSH_KEY&quot;, new File(&apos;${__P(PRIVATE_SSH_KEY_LOCATION
541541
<boolProp name="IfController.useExpression">true</boolProp>
542542
</IfController>
543543
<hashTree>
544-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="add_ssh_key">
544+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="add_ssh_key" enabled="true">
545545
<stringProp name="HTTPSampler.path">${application.postfix}/rest/ssh/latest/keys?user=${admin_login}</stringProp>
546546
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
547547
<stringProp name="HTTPSampler.method">POST</stringProp>
@@ -648,7 +648,7 @@ else{
648648
<stringProp name="shareMode">shareMode.all</stringProp>
649649
</CSVDataSet>
650650
<hashTree/>
651-
<GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="full_repository_clone_and_push" enabled="true"/>
651+
<GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="full_repository_clone_and_push"/>
652652
<hashTree>
653653
<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="set_up_random_variables" enabled="true">
654654
<stringProp name="scriptLanguage">groovy</stringProp>
@@ -772,7 +772,7 @@ if (responseCode != &quot;0&quot;) {
772772
</JSR223PostProcessor>
773773
<hashTree/>
774774
</hashTree>
775-
<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="jmeter_create_repo_shallow_copy">
775+
<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="jmeter_create_repo_shallow_copy" enabled="true">
776776
<stringProp name="scriptLanguage">java</stringProp>
777777
<stringProp name="parameters"></stringProp>
778778
<stringProp name="filename"></stringProp>

0 commit comments

Comments
 (0)