[Bug 14884] New: Test failure from Bug 14470
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Bug ID: 14884 Summary: Test failure from Bug 14470 Change sponsored?: --- Product: Koha Version: 3.20 Hardware: All OS: All Status: NEW Severity: critical Priority: P5 - low Component: Circulation Assignee: koha-bugs@lists.koha-community.org Reporter: robin@catalyst.net.nz QA Contact: testopia@bugs.koha-community.org CC: gmcharlt@gmail.com, kyle.m.hall@gmail.com # 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
-- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Robin Sheat <robin@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz --- Comment #1 from Robin Sheat <robin@catalyst.net.nz> --- 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. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 --- Comment #2 from Robin Sheat <robin@catalyst.net.nz> --- Created attachment 42830 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42830&action=edit Bug 14884: remove spurious conflict markers To test: * Run t/00-merge-conflict-markers.t, ensure it passes -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Robin Sheat <robin@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Robin Sheat <robin@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Trivial patch -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #42830|0 |1 is obsolete| | --- Comment #3 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 42849 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42849&action=edit 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> -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 --- Comment #4 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 42850 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42850&action=edit Bug 14884: Adjust the number of tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@bugs.koha-c | |ommunity.org Assignee|koha-bugs@lists.koha-commun |robin@catalyst.net.nz |ity.org | -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=14470 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de, | |m.de.rooy@rijksmuseum.nl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Test failure from Bug 14470 |[3.20.X] Test failure from | |Bug 14470 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 --- Comment #5 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- 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 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #42849|0 |1 is obsolete| | Attachment #42850|0 |1 is obsolete| | --- Comment #6 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 42912 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42912&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 --- Comment #7 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 42913 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42913&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master QA Contact|testopia@bugs.koha-communit |m.de.rooy@rijksmuseum.nl |y.org | --- Comment #8 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Moving to Pushed to Master to put it in Rmaint queue. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |Pushed to Stable --- Comment #9 from Chris Cormack <chris@bigballofwax.co.nz> --- Pushed to 3.20.x will be in 3.20.5 -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org