Bug 40858 - t/00-merge-conflict-markers.t should only test files part of git repo
Summary: t/00-merge-conflict-markers.t should only test files part of git repo
Status: Pushed to stable
Alias: None
Product: Koha
Classification: Unclassified
Component: Test Suite (show other bugs)
Version: unspecified
Hardware: All All
: P5 - low normal
Assignee: Jonathan Druart
QA Contact: Testopia
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2025-09-23 07:47 UTC by Jonathan Druart
Modified: 2025-09-25 16:31 UTC (History)
1 user (show)

See Also:
GIT URL:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
25.11.00,25.05.04
Circulation function:


Attachments
Bug 40858: Rename context 'all' with 'core' (2.03 KB, patch)
2025-09-23 08:26 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 40858: Search merge conflict on files part of the git index (4.48 KB, patch)
2025-09-23 08:26 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 40858: Search merge conflict on files part of the git index (4.53 KB, patch)
2025-09-23 12:10 UTC, Lucas Gass (lukeg)
Details | Diff | Splinter Review
Bug 40858: Rename context 'all' with 'core' (2.09 KB, patch)
2025-09-23 12:11 UTC, Lucas Gass (lukeg)
Details | Diff | Splinter Review
Bug 40858: Search merge conflict on files part of the git index (4.53 KB, patch)
2025-09-23 12:11 UTC, Lucas Gass (lukeg)
Details | Diff | Splinter Review
Bug 40858: Rename context 'all' with 'core' (2.15 KB, patch)
2025-09-24 11:06 UTC, Paul Derscheid
Details | Diff | Splinter Review
Bug 40858: Search merge conflict on files part of the git index (4.59 KB, patch)
2025-09-24 11:06 UTC, Paul Derscheid
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Druart 2025-09-23 07:47:43 UTC
It's currently failing on kohadev-db-request.txt that is owned by root. But it's not part of the Koha codebase, this file should not be tested.
Comment 1 Jonathan Druart 2025-09-23 08:26:53 UTC
Created attachment 186777 [details] [review]
Bug 40858: Rename context 'all' with 'core'

All was not returning all the files present in the git index, but all
Koha core files. Let's rename it with 'core' to remove ambiguity.
Comment 2 Jonathan Druart 2025-09-23 08:26:55 UTC
Created attachment 186778 [details] [review]
Bug 40858: Search merge conflict on files part of the git index

Same as bug 34303 and bug 33743, our test suite must parse/process files
that are part of the index, not all the other files.

It's currently failing on kohadev-db-request.txt that is owned by root.
But it's not part of the Koha codebase, this file should not be tested.

There were also node_modules and po files that were processed.

Test plan:
  prove t/00-merge-conflict-markers.t
must now return gren
Comment 3 Lucas Gass (lukeg) 2025-09-23 12:10:58 UTC
Created attachment 186790 [details] [review]
Bug 40858: Search merge conflict on files part of the git index

Same as bug 34303 and bug 33743, our test suite must parse/process files
that are part of the index, not all the other files.

It's currently failing on kohadev-db-request.txt that is owned by root.
But it's not part of the Koha codebase, this file should not be tested.

There were also node_modules and po files that were processed.

Test plan:
  prove t/00-merge-conflict-markers.t
must now return gren

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Comment 4 Lucas Gass (lukeg) 2025-09-23 12:11:45 UTC
Created attachment 186791 [details] [review]
Bug 40858: Rename context 'all' with 'core'

All was not returning all the files present in the git index, but all
Koha core files. Let's rename it with 'core' to remove ambiguity.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Comment 5 Lucas Gass (lukeg) 2025-09-23 12:11:48 UTC
Created attachment 186792 [details] [review]
Bug 40858: Search merge conflict on files part of the git index

Same as bug 34303 and bug 33743, our test suite must parse/process files
that are part of the index, not all the other files.

It's currently failing on kohadev-db-request.txt that is owned by root.
But it's not part of the Koha codebase, this file should not be tested.

There were also node_modules and po files that were processed.

Test plan:
  prove t/00-merge-conflict-markers.t
must now return gren

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Comment 6 Paul Derscheid 2025-09-24 11:06:38 UTC
Created attachment 186876 [details] [review]
Bug 40858: Rename context 'all' with 'core'

All was not returning all the files present in the git index, but all
Koha core files. Let's rename it with 'core' to remove ambiguity.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Comment 7 Paul Derscheid 2025-09-24 11:06:40 UTC
Created attachment 186877 [details] [review]
Bug 40858: Search merge conflict on files part of the git index

Same as bug 34303 and bug 33743, our test suite must parse/process files
that are part of the index, not all the other files.

It's currently failing on kohadev-db-request.txt that is owned by root.
But it's not part of the Koha codebase, this file should not be tested.

There were also node_modules and po files that were processed.

Test plan:
  prove t/00-merge-conflict-markers.t
must now return gren

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Comment 8 Lucas Gass (lukeg) 2025-09-24 15:26:54 UTC
Nice work everyone!

Pushed to main for 25.11
Comment 9 Paul Derscheid 2025-09-25 16:31:33 UTC
Nice work everyone!

Pushed to 25.05.x