[Koha-bugs] [Bug 14111] Silence warnings t/Auth_with_shibboleth.t

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14111

M. Tompsett <mtompset at hotmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Blocks|5010                        |
         Depends on|                            |5010
             Status|Patch doesn't apply         |Signed Off

--- Comment #13 from M. Tompsett <mtompset at hotmail.com> ---
(In reply to Jonathan Druart from comment #12)
> Applying: Bug 14111: Silence warnings in t/Auth_with_shibboleth.t
> Applying: Bug 14111 - More t/Auth_with_shibboleth.t silencing
> fatal: sha1 information is lacking or useless (t/Auth_with_shibboleth.t).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.

TEST PLAN
----------
1) prove t/Auth_with_shibboleth.t
   -- noise
2) git bz apply 14111
   -- interactive first patch only!
3) prove t/Auth_with_shibboleth.t
   -- no noise
4) git reset --hard origin/master
5) git bz apply 5010
6) prove t/Auth_with_shibboleth.t
   -- Noise again
7) git bz apply 14111
   -- interactive second patch
8) prove t/Auth_with_shibboleth.t
   -- no noise again

-- 
You are receiving this mail because:
You are watching all bug changes.