Summary: | [3.20.X] Test failure from Bug 14470 | ||
---|---|---|---|
Product: | Koha | Reporter: | Robin Sheat <robin> |
Component: | Circulation | Assignee: | Robin Sheat <robin> |
Status: | CLOSED FIXED | QA Contact: | Marcel de Rooy <m.de.rooy> |
Severity: | critical | ||
Priority: | P5 - low | CC: | chris, gmcharlt, jonathan.druart, katrin.fischer, kyle.m.hall, m.de.rooy |
Version: | 3.20 | ||
Hardware: | All | ||
OS: | All | ||
See Also: | http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14470 | ||
Change sponsored?: | --- | Patch complexity: | Trivial patch |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Attachments: |
Bug 14884: remove spurious conflict markers
Bug 14884: remove spurious conflict markers Bug 14884: Adjust the number of tests Bug 14884: remove spurious conflict markers Bug 14884: Adjust the number of tests |
This doesn't appear in the actual bug, I think it's probably a release merge failure. I'll patch it out for the packages. Created attachment 42830 [details] [review] Bug 14884: remove spurious conflict markers To test: * Run t/00-merge-conflict-markers.t, ensure it passes Created attachment 42849 [details] [review] Bug 14884: remove spurious conflict markers To test: * Run t/00-merge-conflict-markers.t, ensure it passes Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 42850 [details] [review] Bug 14884: Adjust the number of tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Bug 14884 - [3.20.X] Test failure from Bug 14470 42849 - Bug 14884: remove spurious conflict markers 42850 - Bug 14884: Adjust the number of tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14884: remove spurious conflict markers Applying: Bug 14884: Adjust the number of tests % prove t/db_dependent/Circulation.t t/db_dependent/Circulation.t .. ok All tests successful. Files=1, Tests=63, 4 wallclock secs ( 0.02 usr 0.00 sys + 1.92 cusr 0.04 csys = 1.98 CPU) Result: PASS Created attachment 42912 [details] [review] Bug 14884: remove spurious conflict markers To test: * Run t/00-merge-conflict-markers.t, ensure it passes Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 42913 [details] [review] Bug 14884: Adjust the number of tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Moving to Pushed to Master to put it in Rmaint queue. Pushed to 3.20.x will be in 3.20.5 |
# Failed test './t/db_dependent/Circulation.t contains merge conflict markers in line 599' # at t/00-merge-conflict-markers.t line 51. # Looks like you failed 1 test of 8394. t/00-merge-conflict-markers.t ....... Dubious, test returned 1 (wstat 256, 0x100) Failed 1/8394 subtests <<<<<<< HEAD ======= { # Don't allow renewing onsite checkout my $barcode = 'R00000XXX'; my $branch = 'CPL'; ... } $schema->storage->txn_rollback(); >>>>>>> ea92a92... Bug 14470: Do not allow renew for on-site checkouts