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: mdoerr
Backport-of: 8e1d2b091c9a311d98a0b886a803fb18d4405d8a
  • Loading branch information
@RealCLanger
SendaoYan authored and RealCLanger committed Jun 25, 2024
1 parent d3bd5ae commit 1e3e687
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 104 deletions.
2 changes: 2 additions & 0 deletions test/jdk/TEST.groups
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,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/java/security/cert/CertPathValidator/certification

Expand Down
173 changes: 87 additions & 86 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, 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
* @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

3 comments on commit 1e3e687

@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 jdk8u-dev

@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

@openjdk
Copy link

@openjdk openjdk bot commented on 1e3e687 Jun 25, 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 1e3e6877 to openjdk/jdk8u-dev due to conflicts in the following files:

  • test/jdk/TEST.groups

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk8u-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/jdk8u-dev.git master:master

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

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk11u.git 1e3e6877d5c2eb53f9dbb4fc9e045d83975c84b1

# Backport the commit
$ git cherry-pick --no-commit 1e3e6877d5c2eb53f9dbb4fc9e045d83975c84b1
# Resolve conflicts now

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

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk8u-dev with the title Backport 1e3e6877d5c2eb53f9dbb4fc9e045d83975c84b1.

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

Hi all,

This pull request contains a backport of commit 1e3e6877 from the openjdk/jdk11u repository.

The commit being backported was authored by SendaoYan on 25 Jun 2024 and was reviewed by Martin Doerr.

Thanks!

Please sign in to comment.