Skip to content

Comments

Scheduled Updates: Prevent rare PHPUnit failure due to clock time.#43905

Merged
tbradsha merged 4 commits intotrunkfrom
fix/scheduled-updates/make_test_more_robust
Jun 11, 2025
Merged

Scheduled Updates: Prevent rare PHPUnit failure due to clock time.#43905
tbradsha merged 4 commits intotrunkfrom
fix/scheduled-updates/make_test_more_robust

Conversation

@tbradsha
Copy link
Contributor

This is a workaround for a long-standing but infrequent PHPUnit failure.

From p1740167013588129-slack-C034JEXD1RD:

Looks like what's going on here is that there are always two calls to Scheduled_Updates::update_option_cron() during the rest_do_request(), one via class-wpcom-rest-api-v2-endpoint-update-schedules.php:355 and one via class-wpcom-rest-api-v2-endpoint-update-schedules.php:372. Most of the time the second call tries to store the same value in the option as the first, resulting in a total of 3 option updates for the test. But in the rare case that the clock ticks over to the next second in between those two lines, the data is different (due to the updated_at timestamp) resulting in a total of 4 option updates.

We could delete the test, but for now, let's just accept values of 3 and 4.

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:

Do tests still pass?

@tbradsha tbradsha requested a review from a team June 11, 2025 14:42
@tbradsha tbradsha self-assigned this Jun 11, 2025
@tbradsha tbradsha added [Status] Needs Review This PR is ready for review. [Type] Janitorial labels Jun 11, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jun 11, 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 (WordPress.com Site Helper), and enable the fix/scheduled-updates/make_test_more_robust branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/scheduled-updates/make_test_more_robust

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

@github-actions
Copy link
Contributor

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!

@jp-launch-control
Copy link

jp-launch-control bot commented Jun 11, 2025

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

anomiex
anomiex previously approved these changes Jun 11, 2025
Copy link
Contributor

@anomiex anomiex left a comment

Choose a reason for hiding this comment

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

Looks reasonable. One suggestion for improvement inline.

Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com>
@tbradsha tbradsha merged commit 15dd200 into trunk Jun 11, 2025
62 checks passed
@tbradsha tbradsha deleted the fix/scheduled-updates/make_test_more_robust branch June 11, 2025 16:31
@github-actions github-actions bot removed the [Status] Needs Review This PR is ready for review. label Jun 11, 2025
mikestottuk pushed a commit that referenced this pull request Jun 26, 2025
…43905)

* Accept sync counter of both 3 and 4

* Add changelog

* Adjust assert for better messaging

Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com>

---------

Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants