This repository was archived by the owner on Jul 28, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 239
This repository was archived by the owner on Jul 28, 2024. It is now read-only.
dateModifiedMergesAutomatically test is failing #1382
Copy link
Copy link
Closed
Labels
duplicateEither a direct duplicate or will be better resolved by another issueEither a direct duplicate or will be better resolved by another issuescope: testsTesting code. For infrastructure (CI, etc.), use "dev-infrastructure".Testing code. For infrastructure (CI, etc.), use "dev-infrastructure".
Milestone
Description
Running npm run tests:custom-with-wordpress -- -c phpunit.xml --filter dateModifiedMergesAutomatically leads to a following problem:
VersionPress\Tests\Workflow\CloneMergeTest::dateModifiedMergesAutomatically
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'2019-03-05 10:27:39
+'2019-03-05 10:25:58
/opt/versionpress/tests/Workflow/CloneMergeTest.php:146
I checked wptest and wptestclone repositories after the test:
- 10:45 - VersionPress activated on
wptest(by WP-CLI). - 10:47 - Page
E02347A1732744B1B94B3530FA83EB9Bcreated with definedpost_title"Test page for menu" andpost_content"Test page" (by WP-CLI). - 10:47 - 11:26 - Clone
wptestclonecreated (I restricted memory for my Virtualbox, so it was really slow). - 11:26 - Page
E02347A1732744B1B94B3530FA83EB9Bupdatedpost_titleto "Some new title" anddate_modifiedcorrectly set to2019-03-05 10:25:58(by WP-CLI). - 11:28 - Page
E02347A1732744B1B94B3530FA83EB9Bupdatedpost_contentto "Some new content" forwptestcloneanddate_modifiedcorrectly set to2019-03-05 10:27:39(by WP-CLI). - Next
git pullwas running, commit fromwptestclonewas fetched, withpost_contentandpost_modifiedchanged + merge commit was created (by usertest) where onlypost_contentwas merged :-(
❓ Interesting that similar test mergedDatesWithoutConflict from GitRepository works well 🤔
Bash version of VersionPress merge driver was used automatically.
[merge "vp-ini"]
name = VersionPress ini merge driver
driver = /var/www/html/wptest/wp-content/plugins/versionpress/src/Git/merge-drivers/ini-merge.sh %O %A %B
recursive = text
❓ When I force test to use PHP implementation of merge driver, then test will pass 🤔
[merge "vp-ini"]
name = VersionPress ini merge driver
driver = "/usr/local/bin/php" "/var/www/html/wptest/wp-content/plugins/versionpress/src/Git/merge-drivers/ini-merge.php" %O %A %B
recursive = text
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
duplicateEither a direct duplicate or will be better resolved by another issueEither a direct duplicate or will be better resolved by another issuescope: testsTesting code. For infrastructure (CI, etc.), use "dev-infrastructure".Testing code. For infrastructure (CI, etc.), use "dev-infrastructure".