Skip to content

Conversation

@tbradsha
Copy link
Contributor

@tbradsha tbradsha commented Nov 13, 2025

Closes MONOREP-222

As done in #45851 and #45902, this adds locking to prevent parallel tests from colliding.

It seems Sync is the main culprit; perhaps if this continues to be an issue we should add locking to the Jetpack_Sync_TestBase class.

Proposed changes:

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

  • Did this break CI?
  • Does this change make sense?

@tbradsha tbradsha requested a review from a team November 13, 2025 14:31
@tbradsha tbradsha self-assigned this Nov 13, 2025
@tbradsha tbradsha added [Status] Needs Review This PR is ready for review. [Type] Janitorial labels Nov 13, 2025
@github-actions github-actions bot added [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Tests] Includes Tests labels Nov 13, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Nov 13, 2025

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Review, ...).
  • ✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
  3. You can use GitHub's Reviewers functionality to request a review.
  4. When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!


Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen as soon as you deploy your changes after merging this PR (PCYsg-Jjm-p2).
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly:
    • Scheduled release: December 2, 2025

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 13, 2025

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack), and enable the add/ci/yet_more_locking branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack add/ci/yet_more_locking

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@jp-launch-control
Copy link

Code Coverage Summary

This PR did not change code coverage!

That could be good or bad, depending on the situation. Everything covered before, and still is? Great! Nothing was covered before? Not so great. 🤷

Full summary · PHP report · JS report


// For CI coverage tests, use a lock file to avoid multiple copies of this test from interfering with each other.
if ( getenv( 'PHPUNIT_JETPACK_TESTSUITE_IS_PARALLEL' ) === 'true' ) {
static::$lockfile = fopen( WP_CONTENT_DIR . '/themes/.jplock', 'c+' );
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not seeing any theme stuff in this file. What is colliding here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The issue is triggered here:
https://github.com/Automattic/jetpack/actions/runs/19333566055/job/55302450703#step:11:11641

My guess is that $this->server_event_storage->reset(); is wiping things out during the Sync Users test, and that interferes with Theme tests.

Copy link
Contributor

Choose a reason for hiding this comment

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

Looking at the error message there, it seems more likely that it's a race where the Users test somewhere inside of sync calls search_theme_directories() (probably via wp_get_themes()) and gets past line 515, then the other process cleans up the directory before it reaches line 539 for that theme.

If that's what's going on here, then it could probably happen in any of these tests and the idea of locking in Jetpack_Sync_TestBase may be the best one. But we may want to see if Vulcan has any better insight here.

@Automattic/jetpack-vulcan: TL;DR: When running coverage tests, we run the normal and multisite tests in parallel to save some wall clock time. Sometimes this makes Sync tests fail because both are using the same themes directory in the filesystem. We already added locking to Jetpack_Sync_Themes_Test (the one that actually writes the temporary themes) in #45851, and Jetpack_Sync_Plugins_Test (which writes a the/the.php plugin) in #45902. But it's looking like we might need to just lock all the Sync tests, since even filesystem-read-only ones can get broken if one of the filesystem-writing tests writes the wrong thing in the other process. Does that seem right to you?

Copy link
Contributor

Choose a reason for hiding this comment

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

If we do wind up deciding that "lock everything" is the way to go, probably we should mostly revert #45851 and #45902 in favor of a trait that provides the locking functions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] Needs Review This PR is ready for review. [Tests] Includes Tests [Type] Janitorial

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants