Bug 35009

Summary: [21.11] tools/scheduler.pl contains merge markers
Product: Koha Reporter: Aleisha Amohia <aleisha>
Component: ToolsAssignee: Aleisha Amohia <aleisha>
Status: RESOLVED FIXED QA Contact: Katrin Fischer <katrin.fischer>
Severity: blocker    
Priority: P5 - low CC: danyonsewell, fridolin.somers, jonathan.druart
Version: 21.11Keywords: rel_21_11_candidate
Hardware: All   
OS: All   
Change sponsored?: Sponsored Patch complexity: Small patch
Documentation contact: Documentation submission:
Text to go in the release notes:
Version(s) released in:
21.11.25
Bug Depends on: 34349    
Bug Blocks:    
Attachments: Bug 35009: Remove merge conflict markers from tools/scheduler.pl
Bug 35009: Remove merge conflict markers from tools/scheduler.pl
Bug 35009: Remove merge conflict markers from tools/scheduler.pl

Description Aleisha Amohia 2023-10-09 06:26:17 UTC
#   Failed test 'Files should not contain merge markers (./blib/INTRANET_CGI_DIR/tools/scheduler.pl, ./tools/scheduler.pl )'
#   at t/00-merge-conflict-markers.t line 52.
#          got: '2'
#     expected: '0'
# Looks like you failed 1 test of 1.
t/00-merge-conflict-markers.t ............... 
1..1
not ok 1 - Files should not contain merge markers (./blib/INTRANET_CGI_DIR/tools/scheduler.pl, ./tools/scheduler.pl )

Only valid in 21.11
Comment 1 Aleisha Amohia 2023-10-09 06:36:10 UTC
Created attachment 156721 [details] [review]
Bug 35009: Remove merge conflict markers from tools/scheduler.pl

To test:

Confirm tests pass with patch applied t/00-merge-conflict-markers.t

Sponsored-by: Catalyst IT
Comment 2 Jonathan Druart 2023-10-09 08:42:13 UTC
Created attachment 156722 [details] [review]
Bug 35009: Remove merge conflict markers from tools/scheduler.pl

To test:

Confirm tests pass with patch applied t/00-merge-conflict-markers.t

Sponsored-by: Catalyst IT

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Comment 3 Jonathan Druart 2023-10-09 08:42:29 UTC
This should not happen. We have the QA script and a unit test to catch them before the release.
Comment 4 Katrin Fischer 2023-10-09 21:11:27 UTC
Created attachment 156770 [details] [review]
Bug 35009: Remove merge conflict markers from tools/scheduler.pl

To test:

Confirm tests pass with patch applied t/00-merge-conflict-markers.t

Sponsored-by: Catalyst IT

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Comment 5 Danyon Sewell 2023-10-09 22:14:37 UTC
Have pushed this patch to 21.11.x branch ready for next release
Comment 6 Fridolin Somers 2024-03-25 09:36:45 UTC
Resolved ?