[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.10-58-g6ede349

Mon Jun 20 00:07:14 CEST 2016

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.20.x has been updated
       via  6ede349cdbe8848ce3d3687edb32f07bcf7870c7 (commit)
       via  4c726cbd1c55b56822c7461a9f81b60f9cf3fd74 (commit)
       via  d608042be491521eab36f7be23e60414f199a206 (commit)
      from  0eae19928ba9ba3929221f6413bcb7d79f9fe81d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ede349cdbe8848ce3d3687edb32f07bcf7870c7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sat Apr 23 07:30:35 2016 +0100

    Bug 14632: Add Copyright for the Koha Dev Team

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    https://bugs.koha-community.org/show_bug.cgi?id=14362

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 68dbe8415f17801798fea26803b9bd9fd5e713bb)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit ac49b0fc706764f823d46aa7514e793beef98301)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 4c726cbd1c55b56822c7461a9f81b60f9cf3fd74
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sun Jun 7 23:40:50 2015 -0400

    Bug 14362: Regression tests

    This should trigger the error. Attempts to shift system time
    zones did not make sense as to the number of failures.

    Added Time::Fake dependency, if it isn't installed these extra
    tests don't run. There is a nice skip message about it.

    Added License text.

    TEST PLAN
    ---------
     1) apply test patch
     2) sudo dpkg-reconfigure tzdata
        -- set your system time to GMT (Africa/Abidjan)
     3) prove t/Circulation/AgeRestrictionMarkers.t
        -- should not fail, even if you change system
           time to any time.
     4) sudo dpkg-reconfigure tzdata
        -- set your timezone to Eastern
     5) sudo date -s"2015-06-18 21:15:00"
     6) date
        -- should be past 9pm Eastern timezone
     7) prove t/Circulation/AgeRestrictionMarkers.t
        -- kaboom!
     8) sudo date -s"2015-06-18 12:00:00"
     9) date
        -- should be noon Eastern timezone
    10) prove t/Circulation/AgeRestrictionMarkers.t
        -- success?! Time sensitive tests are bad tests.
    11) sudo apt-get install libtime-fake-perl
    12) prove t/Circulation/AgeRestrictionMarkers.t
        -- kaboom!
        -- changing timezone to anything other than GMT
           should trigger a kaboom.
    13) apply fix patch
    14) prove t/Circulation/AgeRestrictionMarkers.t
        -- should work all the time.
    15) less t/Circulation/AgeRestrictionMarkers.t
        -- the license text should be similar to
           http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence
    16) koha qa test tools.

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a2aba3c86f106603212eb2c5beb52c3cdfe49857)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Conflicts:
    	C4/Installer/PerlDependencies.pm

    (cherry picked from commit 975f7bb9aa32f47f61ab0afd67f537d8d24ea9d6)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d608042be491521eab36f7be23e60414f199a206
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sun Jun 7 21:26:53 2015 -0400

    Bug 14362: PEGI15 Circulation/AgeRestrictionMarkers test fails

    It is best to test when UTC date is a date in the future compared
    to your timezone. I'm in Eastern, so right now, I expect this
    test to fail for another 2.5 hours.

    TEST PLAN
    ---------
    1) prove t/Circulation/AgeRestrictionMarkers.t
       -- fails for PEGI 15 after 9pm.
    2) Apply patch
    3) prove t/Circulation/AgeRestrictionMarkers.t
       -- works.
    4) koha qa test tools

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 73f55165bef229668a135bee7e8c90a2c9c3f0a7)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit c894bd4ab5401aec642089f00c9e6b3909e01d2b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm                     |    3 +-
 C4/Installer/PerlDependencies.pm      |    5 ++
 t/Circulation/AgeRestrictionMarkers.t |   82 ++++++++++++++++++++++++++-------
 3 files changed, 73 insertions(+), 17 deletions(-)

hooks/post-receive
-- 
main Koha release repository