Merge branch 'version/2.5'

* version/2.5: [ENSCORESW-3350] change expected when_born in lsf.t to 2020 to match change in died/when_died being merged up from version/2.2 removed year from bacct output - year is not included in lsf 10.1.0.6 as configured on the EBI farm [ENSCORESW-3350] update expected output in lsf.t to conform to Meadow/LSF.pm date guessing in 2020
Ensembl · Jan 6, 2020 · 094e72a · 094e72a
2 parents c8d4668 + a3c5513
commit 094e72a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/t/04.meadow/fake_bin/bacct b/t/04.meadow/fake_bin/bacct
@@ -84,7 +84,7 @@ Wed Dec  2 13:52:32: Submitted from host <farm3-head2>, CWD <$HOME/OrthologQM>,
 Wed Dec  2 13:52:34: [75] dispatched to <bc-31-2-11>, Effective RES_REQ <select
                      [(mem>100) && (type == any )] order[r15s:pg] rusage[mem=10
                      0.00] >;
-Wed Dec  2 13:53:29 2015: Completed <exit>; TERM_MEMLIMIT: job killed after reaching
+Wed Dec  2 13:53:29: Completed <exit>; TERM_MEMLIMIT: job killed after reaching
                       LSF memory usage limit.
 
  EXCEPTION STATUS:  underrun

diff --git a/t/04.meadow/lsf.t b/t/04.meadow/lsf.t
@@ -162,7 +162,7 @@ is_deeply($submitted_pids, [12345], 'Returned the correct pid');
 
 my $expected_bacct = {
     '2581807[1]' => {
-        'when_died' => '2015-11-26 14:25:12',
+        'when_died' => '2020-11-26 14:25:12',
         'pending_sec' => '147',
         'exception_status' => 'underrun',
         'cause_of_death' => undef,
@@ -171,11 +171,11 @@ my $expected_bacct = {
         'cpu_sec' => '2.74',
         'exit_status' => 'done',
         'swap_megs' => 144,
-        'when_born' => '2015-11-26 14:25:09',
+        'when_born' => '2020-11-26 14:25:09',
         'meadow_host' => 'bc-25-1-10',
     },
     '2581801[48]' => {
-        'when_died' => '2015-11-26 14:25:16',
+        'when_died' => '2020-11-26 14:25:16',
         'pending_sec' => '196',
         'exception_status' => 'underrun',
         'mem_megs' => 50,
@@ -184,7 +184,7 @@ my $expected_bacct = {
         'cpu_sec' => '2.61',
         'exit_status' => 'done',
         'swap_megs' => 269,
-        'when_born' => '2015-11-26 14:24:57',
+        'when_born' => '2020-11-26 14:24:57',
         'meadow_host' => 'bc-27-2-07',
     },
     '3194397[75]' => {
@@ -193,11 +193,11 @@ my $expected_bacct = {
         'pending_sec' => '2',
         'exception_status' => 'underrun',
         'swap_megs' => 218,
-        'when_died' => '2015-12-02 13:53:29',
+        'when_died' => '2020-12-02 13:53:29',
         'cause_of_death' => 'MEMLIMIT',
         'exit_status' => 'exit/TERM_MEMLIMIT',
         'mem_megs' => 102,
-        'when_born' => '2015-12-02 13:52:34',
+        'when_born' => '2020-12-02 13:52:34',
         'meadow_host' => 'bc-31-2-11',
     },
 };
@@ -210,8 +210,8 @@ lives_and( sub {
 }, 'Can call bacct on process_ids');
 
 lives_and( sub {
-    local $ENV{EHIVE_EXPECTED_BACCT} = '-l -C 2015/10/11/12:23,2015/12/12/23:58 -u kb3';
-    my $h = $lsf_meadow->get_report_entries_for_time_interval('2015-10-11 12:23:45', '2015-12-12 23:56:59', 'kb3');
+    local $ENV{EHIVE_EXPECTED_BACCT} = '-l -C 2020/10/11/12:23,2020/12/12/23:58 -u kb3';
+    my $h = $lsf_meadow->get_report_entries_for_time_interval('2020-10-11 12:23:45', '2020-12-12 23:56:59', 'kb3');
     is_deeply($h, $expected_bacct, 'Got bacct output');
 }, 'Can call bacct on a date range');