Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK-8300205: Swing test bug8078268 make latch timeout configurable #12011

Closed
wants to merge 2 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Jan 16, 2023

The test javax/swing/text/html/parser/Parser/8078268/bug8078268.java has a latch timeout that is currently fix but should better be configurable to better deal with slow test infrastructures.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8300205: Swing test bug8078268 make latch timeout configurable

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12011/head:pull/12011
$ git checkout pull/12011

Update a local copy of the PR:
$ git checkout pull/12011
$ git pull https://git.openjdk.org/jdk pull/12011/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12011

View PR using the GUI difftool:
$ git pr show -t 12011

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12011.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 16, 2023

👋 Welcome back mbaesken! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 16, 2023
@openjdk
Copy link

openjdk bot commented Jan 16, 2023

@MBaesken The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Jan 16, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 16, 2023

Webrevs

Copy link
Member

@aivanov-jdk aivanov-jdk left a comment

Choose a reason for hiding this comment

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

Looks fine.

I'd appreciate if you update the copyright year too.

@openjdk
Copy link

openjdk bot commented Jan 16, 2023

@MBaesken This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8300205: Swing test bug8078268 make latch timeout configurable

Reviewed-by: aivanov, serb

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 14 new commits pushed to the master branch:

  • 9a36f8a: 8299673: Simplify object pinning interactions with string deduplication
  • 3462438: 8299576: Reimplement java.io.Bits using VarHandle access
  • f829a67: 8300227: [macos_aarch64] assert(cpu_has("hw.optional.arm.FEAT_AES")) failed after JDK-8297092
  • 6a81d52: 8299213: Bad cast in GrowableArrayWithAllocator<>::grow
  • 8365c67: 8300084: AquaFileChooserUI.getDefaultButton returns null
  • 382fe51: 8163229: several regression tests have a main method that is never executed
  • 06f9374: 8298867: Basics.java fails with SSL handshake exception
  • 859ccd1: 8299847: RISC-V: Improve PrintOptoAssembly output of CMoveI/L nodes
  • 240830d: 8297092: [macos_aarch64] Add support for SHA feature detection
  • f52f6e6: 8299972: Remove metaprogramming/removeReference.hpp
  • ... and 4 more: https://git.openjdk.org/jdk/compare/289aed465e9b8449938d4cdb515748e7aca1d070...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 16, 2023
@mrserb
Copy link
Member

mrserb commented Jan 16, 2023

I remember that match 5 uses timeout=4, so I wonder if timeout will be changed to 40 seconds will it be possible to verify old bug or not.

@aivanov-jdk
Copy link
Member

aivanov-jdk commented Jan 16, 2023

I remember that match 5 uses timeout=4, so I wonder if timeout will be changed to 40 seconds will it be possible to verify old bug or not.

@mrserb, The test still fails:

./jdk-9-b123/bin/java -Dtest.timeout.factor=5 bug8078268
Exception in thread "main" java.lang.RuntimeException: Parsing takes too long. Current timeout is 50000
        at bug8078268.main(bug8078268.java:65)

It passes on jdk-9-b124 where JDK-8078268 is fixed.

@@ -38,7 +38,8 @@
@run main bug8078268
*/
public class bug8078268 {
private static final long TIMEOUT = 10_000;
private static final float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0"));
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
private static final float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0"));
private static final float timeoutFactor =
Float.parseFloat(System.getProperty("test.timeout.factor", "1.0"));

The line is 115 chars long, I suggest wrapping it. Using static import for parseFloat will also reduce the length; getProperty could also be statically imported.

@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 17, 2023

Going to push as commit e82dc69.
Since your change was applied there have been 14 commits pushed to the master branch:

  • 9a36f8a: 8299673: Simplify object pinning interactions with string deduplication
  • 3462438: 8299576: Reimplement java.io.Bits using VarHandle access
  • f829a67: 8300227: [macos_aarch64] assert(cpu_has("hw.optional.arm.FEAT_AES")) failed after JDK-8297092
  • 6a81d52: 8299213: Bad cast in GrowableArrayWithAllocator<>::grow
  • 8365c67: 8300084: AquaFileChooserUI.getDefaultButton returns null
  • 382fe51: 8163229: several regression tests have a main method that is never executed
  • 06f9374: 8298867: Basics.java fails with SSL handshake exception
  • 859ccd1: 8299847: RISC-V: Improve PrintOptoAssembly output of CMoveI/L nodes
  • 240830d: 8297092: [macos_aarch64] Add support for SHA feature detection
  • f52f6e6: 8299972: Remove metaprogramming/removeReference.hpp
  • ... and 4 more: https://git.openjdk.org/jdk/compare/289aed465e9b8449938d4cdb515748e7aca1d070...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 17, 2023
@openjdk openjdk bot closed this Jan 17, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 17, 2023
@openjdk
Copy link

openjdk bot commented Jan 17, 2023

@MBaesken Pushed as commit e82dc69.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants