[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2057458553ae292edc4f728fe713768168d05ee3

[Evergreen Git]

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 "Evergreen ILS".

The branch, master has been updated
       via  2057458553ae292edc4f728fe713768168d05ee3 (commit)
       via  c62be1823e23f07949937538f1601d8c09af3bdf (commit)
      from  ad0f60ac409b8434a5ee3e552b2efa0358ae6a00 (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 2057458553ae292edc4f728fe713768168d05ee3
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Mon Nov 7 20:06:03 2016 -0500

    LP#1640153 Fix abort-transit-copy-status.t perl test.
    
    Fixes added by bug 1613374 changed the behavior of canceled
    transits so that the test written for bug 1306666 stopped working.
    Accounting for the new "Canceled Transit" status fixes the test.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t b/Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t
index fdf47d0..699716c 100644
--- a/Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t
+++ b/Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t
@@ -196,7 +196,7 @@ $copy = $apputils->simplereq(
     $authtoken[0],
     $copy->id()
 );
-is($copy->status(), OILS_COPY_STATUS_RESHELVING, 'Copy reshelving');
+is($copy->status(), OILS_COPY_STATUS_CANCELED_TRANSIT, 'Copy in Canceled Transit status');
 
 # Check copy in at BR1
 $checkin = $apputils->simplereq(
@@ -414,7 +414,7 @@ $copy = $apputils->simplereq(
     $authtoken[0],
     $copy->id()
 );
-is($copy->status(), OILS_COPY_STATUS_RESHELVING, 'Copy is reshelving after return transit abort');
+is($copy->status(), OILS_COPY_STATUS_CANCELED_TRANSIT, 'Copy is in Canceled Transit status');
 
 # Logout at BR1.
 $script->logout($authtoken[0]);

commit c62be1823e23f07949937538f1601d8c09af3bdf
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Mon Nov 7 19:10:06 2016 -0500

    Fix purge_user_activity.pg live test
    
    The purge_user_activity.pg test inserts rows into actor.usr_activity
    in a random date order, but the changes in bug 1570909 created a trigger
    that overwrites the previous entry for a transient type, causing the
    test to fail.  We reorder the usr_activity rows so that the most recent
    row will be in place.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/sql/Pg/live_t/purge-user-activity.pg b/Open-ILS/src/sql/Pg/live_t/purge-user-activity.pg
index bf38146..b432dd8 100644
--- a/Open-ILS/src/sql/Pg/live_t/purge-user-activity.pg
+++ b/Open-ILS/src/sql/Pg/live_t/purge-user-activity.pg
@@ -8,14 +8,14 @@ SELECT plan(6);
 -- shuffle event_times for randomness.
 INSERT INTO actor.usr_activity (usr, etype, event_time) VALUES
     (:usr_one, 1, NOW() - '2 days'::INTERVAL),
-    (:usr_one, 1, NOW()),
     (:usr_one, 1, NOW() - '1 days'::INTERVAL),
+    (:usr_one, 1, NOW()),
+    (:usr_one, 2, NOW() - '2 days'::INTERVAL),
     (:usr_one, 2, NOW() - '1 days'::INTERVAL),
     (:usr_one, 2, NOW()),
-    (:usr_one, 2, NOW() - '2 days'::INTERVAL),
+    (:usr_two, 1, NOW() - '2 days'::INTERVAL),
     (:usr_two, 1, NOW() - '1 days'::INTERVAL),
-    (:usr_two, 1, NOW()),
-    (:usr_two, 1, NOW() - '2 days'::INTERVAL);
+    (:usr_two, 1, NOW());
 
 
 SELECT actor.purge_usr_activity_by_type(1);

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

Summary of changes:
 .../19-lp1306666-abort-transit-copy-status.t       |    4 ++--
 Open-ILS/src/sql/Pg/live_t/purge-user-activity.pg  |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS