circulation.tt contains merge conflict markers; the test fails, but issues a message stating that no merge conflict markers were found:
not ok 5130 - ./koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt has no merge conflict markers
This appears to be a simple cut and paste error.
Additionally, the failure message is augmented by a diag() message which gives the line in which the offending marker was found. However, diag() messages are only displayed when the test is run outside of a harness. This has the unwanted side-effect of leaving important information about the failure out when the test is run in harness such as during 'make test.'
The attached patch addresses both issues.
Created attachment 6063 [details] [review]
This should be applied to 3.4.x/3.6.x/master.
Created attachment 6159 [details] [review]
Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
Signed-off-by: Chris Cormack <firstname.lastname@example.org>
QA comment: small patch, fixes a typo
patch pushed, please test