RFR: 2327: Skip CheckTests.acceptSimpleMerges on older Git

Zhao Song zsong at openjdk.org
Thu Jul 11 23:17:20 UTC 2024


On Thu, 11 Jul 2024 23:00:05 GMT, Pavel Rappo <prappo at openjdk.org> wrote:

> Please review this test fix.
> 
> A recently added test fails in environments with Git versions older than 2.36. This is because the test verifies functionality that uses `--remerge-diff` added to [Git 2.36]( https://github.blog/2022-04-18-highlights-from-git-2-36/).
> 
> Note that it's sufficient to conditionally skip the test. We don't need to amend the logic being tested, as bots are run on Git 2.36 or newer. The test assumes 2.36 as the minimum Git version. The test uses the existing functionality provided by `org.openjdk.skara.vcs.git.GitVersion`. Hope, that new dependency is okay.

LGTM

-------------

Marked as reviewed by zsong (Reviewer).

PR Review: https://git.openjdk.org/skara/pull/1677#pullrequestreview-2173233826


More information about the skara-dev mailing list