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

8304174: Remove delays from httpserver tests #1788

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 25, 2023

I backport this for parity with 17.0.10-oracle.

I had to resolve the copyright in Test1.java. Will mark as clean.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8304174 needs maintainer approval

Issue

  • JDK-8304174: Remove delays from httpserver tests (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1788/head:pull/1788
$ git checkout pull/1788

Update a local copy of the PR:
$ git checkout pull/1788
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1788/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1788

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1788.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 25, 2023

👋 Welcome back goetz! 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 changed the title Backport 450567031ec32846c9a8f157eb56bd099b17b5a5 8304174: Remove delays from httpserver tests Sep 25, 2023
@openjdk
Copy link

openjdk bot commented Sep 25, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Sep 25, 2023

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 25, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 25, 2023

Webrevs

@openjdk openjdk bot added the approval label Sep 26, 2023
@openjdk
Copy link

openjdk bot commented Sep 27, 2023

@GoeLin 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:

8304174: Remove delays from httpserver tests

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 3 new commits pushed to the master branch:

  • 04d0906: 8311631: When multiple users run tools/jpackage/share/LicenseTest.java, Permission denied for writing /var/tmp/*.files
  • 52962e4: 8315770: serviceability/sa/TestJmapCoreMetaspace.java should run with -XX:-VerifyDependencies
  • 1d618a3: 8271892: mark hotspot runtime/PrintStringTableStats/PrintStringTableStatsTest.java test as ignoring external VM flags

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 ready Pull request is ready to be integrated and removed approval labels Sep 27, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Sep 27, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Sep 27, 2023

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

  • 1b5139b: 8298735: Some tools/jpackage/windows/* tests fails with jtreg test timeout
  • cdbce9c: 8249826: 5 javax/net/ssl/SSLEngine tests use @ignore w/o bug-id
  • 23457a6: 8297798: Timeout with DTLSOverDatagram test template
  • 94c154e: 8292261: adjust timeouts in JLI GetObjectSizeIntrinsicsTest.java
  • c345ffa: 8288961: jpackage: test MSI installation fix
  • 6bdd611: 8286475: Drop --enable-preview from instanceof pattern matching related tests
  • 035b3f5: 8286473: Drop --enable-preview from Record related tests
  • cbdacc2: 8282011: test/jdk/tools/jpackage/windows/WinL10nTest.java test fails if light.exe is not in %PATH%
  • f79ed4d: 8281874: Can't unpack msi installers from test/jdk/tools/jpackage/windows/test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java test
  • 4e6d34f: 8275440: Remove VirtualSpaceList::is_full()
  • ... and 6 more: https://git.openjdk.org/jdk17u-dev/compare/2ac844b23238fa017314e98ce860b389dfa51326...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 27, 2023

@GoeLin Pushed as commit 80c8ce7.

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

@GoeLin GoeLin deleted the goetz_backport_8304174 branch September 27, 2023 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant