Skip to content

Commit

Permalink
8334441: Mark tests in jdk_security_infra group as manual
Browse files Browse the repository at this point in the history 
Reviewed-by: clanger, mullan
  • Loading branch information
@rhalade
rhalade committed Jun 21, 2024
1 parent 93d9802 commit 8e1d2b0
Show file tree
Hide file tree
Showing 10 changed files with 158 additions and 155 deletions.
2 changes: 0 additions & 2 deletions test/jdk/ProblemList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,6 @@ javax/net/ssl/SSLSession/CertMsgCheck.java 8326705 generic-

sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java 8316183,8333317 generic-all

security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1 8333640 generic-all

############################################################################

# jdk_sound
Expand Down
5 changes: 4 additions & 1 deletion test/jdk/TEST.groups
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ jdk_security = \
:jdk_security3 \
:jdk_security4

# Tests in this group are manual as they depend on external infra
# and may fail with external reasons, for instance - change in CA test portal.
jdk_security_infra = \
security/infra

Expand Down Expand Up @@ -618,6 +620,7 @@ jdk_core_manual_no_input = \
javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java

jdk_security_manual_no_input = \
:jdk_security_infra \
com/sun/crypto/provider/Cipher/DES/PerformanceTest.java \
com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java \
com/sun/crypto/provider/Cipher/AEAD/GCMIncrementDirect4.java \
Expand Down Expand Up @@ -661,4 +664,4 @@ jdk_containers_extended = \

jdk_core_no_security = \
:jdk_core \
-:jdk_security
-:jdk_security
268 changes: 135 additions & 133 deletions test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -26,8 +26,8 @@
* @bug 8245654 8256895
* @summary Interoperability tests with Certigna Root CAs from Dhimyotis
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath CertignaCA OCSP
* @run main/othervm -Djava.security.debug=certpath CertignaCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath CertignaCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath CertignaCA CRL
*/
public class CertignaCA {
// Owner: CN=Certigna Services CA, OID.2.5.4.97=NTRFR-48146308100036,
Expand Down
6 changes: 3 additions & 3 deletions test/jdk/security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -27,8 +27,8 @@
* @summary Interoperability tests with "D-Trust Root Class 3 CA 2 2009" and
* "D-Trust Root Class 3 CA 2 EV 2009" CAs
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath DTrustCA OCSP
* @run main/othervm -Djava.security.debug=certpath DTrustCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath DTrustCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath DTrustCA CRL
*/
public class DTrustCA {

Expand Down
6 changes: 3 additions & 3 deletions ...k/security/infra/java/security/cert/CertPathValidator/certification/DigicertCSRootG5.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -26,8 +26,8 @@
* @bug 8318759
* @summary Interoperability tests with Digicert CS Root G5 certificates
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=ocsp,certpath DigicertCSRootG5 OCSP
* @run main/othervm -Djava.security.debug=certpath DigicertCSRootG5 CRL
* @run main/othervm/manual -Djava.security.debug=ocsp,certpath DigicertCSRootG5 OCSP
* @run main/othervm/manual -Djava.security.debug=certpath DigicertCSRootG5 CRL
*/

public class DigicertCSRootG5 {
Expand Down
6 changes: 3 additions & 3 deletions ...jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -26,8 +26,8 @@
* @bug 8319187
* @summary Interoperability tests with eMudhra emSign Root CA G2 CS root
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath EmSignRootG2CA OCSP
* @run main/othervm -Djava.security.debug=certpath EmSignRootG2CA CRL
* @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA CRL
*/

public class EmSignRootG2CA {
Expand Down
6 changes: 3 additions & 3 deletions test/jdk/security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -26,8 +26,8 @@
* @bug 8256421
* @summary Interoperability tests with Harica CAs
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath HaricaCA OCSP
* @run main/othervm -Djava.security.debug=certpath HaricaCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath HaricaCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath HaricaCA CRL
*/

/*
Expand Down
6 changes: 3 additions & 3 deletions test/jdk/security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -26,8 +26,8 @@
* @bug 8232019 8256895
* @summary Interoperability tests with LuxTrust Global Root 2 CA
* @build ValidatePathWithParams
* @run main/othervm -Djava.security.debug=certpath LuxTrustCA OCSP
* @run main/othervm -Djava.security.debug=certpath LuxTrustCA CRL
* @run main/othervm/manual -Djava.security.debug=certpath LuxTrustCA OCSP
* @run main/othervm/manual -Djava.security.debug=certpath LuxTrustCA CRL
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/security/infra/javax/net/ssl/HttpsURLConnectionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* KEYCHAINSTORE-ROOT trust store
* @library /test/lib
* @requires os.family == "mac"
* @run main/othervm HttpsURLConnectionTest https://github.com KeychainStore-Root
* @run main/othervm/manual HttpsURLConnectionTest https://github.com KeychainStore-Root
*/
import java.io.*;
import java.net.*;
Expand Down

5 comments on commit 8e1d2b0

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@sendaoYan
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk:jdk23

@openjdk
Copy link

@openjdk openjdk bot commented on 8e1d2b0 Jun 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sendaoYan the backport was successfully created on the branch backport-sendaoYan-8e1d2b09-jdk23 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk23, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8e1d2b09 from the openjdk/jdk repository.

The commit being backported was authored by Rajan Halade on 21 Jun 2024 and was reviewed by Christoph Langer and Sean Mullan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk:

$ git fetch https://github.com/openjdk-bots/jdk.git backport-sendaoYan-8e1d2b09-jdk23:backport-sendaoYan-8e1d2b09-jdk23
$ git checkout backport-sendaoYan-8e1d2b09-jdk23
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk.git backport-sendaoYan-8e1d2b09-jdk23

@sendaoYan
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8e1d2b0 Jun 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sendaoYan Could not automatically backport 8e1d2b09 to openjdk/jdk21u-dev due to conflicts in the following files:

  • test/jdk/TEST.groups
  • test/jdk/security/infra/javax/net/ssl/HttpsURLConnectionTest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-sendaoYan-8e1d2b09-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 8e1d2b091c9a311d98a0b886a803fb18d4405d8a

# Backport the commit
$ git cherry-pick --no-commit 8e1d2b091c9a311d98a0b886a803fb18d4405d8a
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 8e1d2b091c9a311d98a0b886a803fb18d4405d8a'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport 8e1d2b091c9a311d98a0b886a803fb18d4405d8a.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8e1d2b09 from the openjdk/jdk repository.

The commit being backported was authored by Rajan Halade on 21 Jun 2024 and was reviewed by Christoph Langer and Sean Mullan.

Thanks!

Please sign in to comment.