Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit 8aa2238

Browse files
author
SAMEER PANDIT
committed
add cts category, diable security tests
1 parent 6ca1ecf commit 8aa2238

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

main/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@
149149

150150
<property name="https.1.port" value="1${https.port}" />
151151
<property name="https.2.port" value="2${https.port}" />
152-
152+
<!-- Skip below https://jira.oraclecorp.com/jira/browse/IDCINTER-82
153153
<antcall target="cipher-test">
154154
<param name="should-pass-cipher" value="SSL_RSA_WITH_RC4_128_MD5"/>
155155
<param name="enable-cipher" value="SSL_RSA_WITH_RC4_128_MD5"/>
156156
<param name="https.port" value="${https.1.port}"/>
157157
</antcall>
158-
158+
159159
<antcall target="cipher-test">
160160
<param name="should-pass-cipher" value=""/>
161161
<param name="enable-cipher" value="SSL_RSA_WITH_3DES_EDE_CBC_SHA"/>
162162
<param name="https.port" value="${https.1.port}"/>
163-
</antcall>
163+
</antcall>-->
164164

165165
<antcall target="cipher-test">
166166
<param name="should-pass-cipher" value=""/>
@@ -224,12 +224,12 @@
224224
<param name="enable-cipher" value="SSL_RSA_WITH_NULL_MD5"/>
225225
<param name="https.port" value="${https.2.port}"/>
226226
</antcall>
227-
227+
<!-- Skip below https://jira.oraclecorp.com/jira/browse/IDCINTER-82
228228
<antcall target="cipher-test">
229229
<param name="should-pass-cipher" value="SSL_RSA_WITH_RC4_128_SHA"/>
230230
<param name="enable-cipher" value="SSL_RSA_WITH_RC4_128_SHA"/>
231231
<param name="https.port" value="${https.2.port}"/>
232-
</antcall>
232+
</antcall>-->
233233

234234
<antcall target="cipher-test">
235235
<param name="should-pass-cipher" value="SSL_RSA_WITH_NULL_SHA"/>

main/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
&testproperties;
1515
&commonSecurity;
1616

17-
<target name="all"
18-
depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
17+
<!--<target name="all"
18+
depends="clean, build, setup, deploy, run, undeploy, unsetup"/>-->
19+
<target name="all" depends="clean">
20+
<echo message="Known failure see https://jira.oraclecorp.com/jira/browse/IDCINTER-82"/>
21+
</target>
22+
1923

2024
<target name="run-test"
2125
depends="clean, build, deploy, run, undeploy"/>

main/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
&testproperties;
1515
&commonSecurity;
1616

17-
<target name="all"
18-
depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
17+
<!--<target name="all"
18+
depends="clean, build, setup, deploy, run, undeploy, unsetup"/>-->
19+
<target name="all" depends="clean">
20+
<echo message="Known failure see https://jira.oraclecorp.com/jira/browse/IDCINTER-82"/>
21+
</target>
1922

2023
<target name="run-test"
2124
depends="clean, build, deploy, run, undeploy"/>

main/appserver/tests/cts_smoke/run_test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ run_test_id(){
191191
echo "Invalid Test ID"
192192
exit 1
193193
fi
194-
cts_to_junit $result $WORKSPACE/results/junitreports/test_results_junit.xml
194+
cts_to_junit $result $WORKSPACE/results/junitreports/test_results_junit.xml $1
195195
upload_test_results
196196
delete_bundle
197197
cd -
@@ -203,6 +203,7 @@ list_test_ids(){
203203
}
204204

205205
cts_to_junit(){
206+
junitCategory=$3
206207
cd $WORKSPACE/results
207208
rm -rf $2
208209
cat $1 | ${GREP} -a "\[javatest.batch\] Finished Test" > results.txt
@@ -219,7 +220,7 @@ cts_to_junit(){
219220
classname=`echo $id | cut -d '#' -f1 | ${SED} s@"\/"@"."@g`
220221
name=`echo $id | cut -d '#' -f2`
221222

222-
echo " <testcase classname=\"$classname\" name=\"$name\">" >> $2
223+
echo " <testcase classname=\"${junitCategory}.$classname\" name=\"$name\">" >> $2
223224
if [ "${status}" = "FAILED" ]
224225
then
225226
echo " <failure type=\"CtsFailure\"> n/a </failure>" >> $2

0 commit comments

Comments
 (0)