[ARVADOS] updated: 1ed38089f9d9969abde1849743f0fdf52d3d2d93

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/pipeline_instances_test.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

       via  1ed38089f9d9969abde1849743f0fdf52d3d2d93 (commit)
       via  34471863720a9e301be1604c2bd546627d435606 (commit)
       via  1a20f5f5423dfab4e03d267680da30125487425a (commit)
       via  4265a54aa0d505c5c35b9b290e2c6600a2766709 (commit)
       via  ea80735a2ea4067d682cde533565dc42920f8d5c (commit)
      from  9feeea1226399a9fc28acc53eafc45d884f7db65 (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.


commit 1ed38089f9d9969abde1849743f0fdf52d3d2d93
Merge: 9feeea1 3447186
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 23 16:36:32 2014 -0400

    refs #4227
    Merge branch '4227-test-fix'


commit 34471863720a9e301be1604c2bd546627d435606
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 23 16:27:02 2014 -0400

    no issue #

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index dff24a6..3d7c348 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -322,6 +322,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
       assert page.has_text? 'This pipeline started at'
       page_text = page.text
+
       match = /This pipeline started at (.*)\. It failed after (.*) seconds at (.*)\. Check the Log/.match page_text
       assert_not_nil(match, 'Did not find text - This pipeline started at . . . ')
 

commit 1a20f5f5423dfab4e03d267680da30125487425a
Merge: 4265a54 9feeea1
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 23 16:24:00 2014 -0400

    no issue #
    Merge branch 'master' of git.curoverse.com:arvados


commit 4265a54aa0d505c5c35b9b290e2c6600a2766709
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 23 16:22:50 2014 -0400

    refs #4227 - update strptime format for parsing pipeline start and finish time.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 0fcf1be..dff24a6 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -323,19 +323,18 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       assert page.has_text? 'This pipeline started at'
       page_text = page.text
       match = /This pipeline started at (.*)\. It failed after (.*) seconds at (.*)\. Check the Log/.match page_text
+      assert_not_nil(match, 'Did not find text - This pipeline started at . . . ')
 
       start_at = match[1]
       finished_at = match[3]
+      assert_not_nil(start_at, 'Did not find start_at time')
+      assert_not_nil(finished_at, 'Did not find finished_at time')
 
       # start and finished time display is of the format '2:20 PM 10/20/2014'
-      begin
-        start_time = DateTime.strptime(start_at, '%H:%M %p %m/%d/%Y').to_time
-        finished_time = DateTime.strptime(finished_at, '%H:%M %p %m/%d/%Y').to_time
-        assert_equal(run_time, finished_time-start_time,
-          "Time difference did not match for start_at #{start_at}, finished_at #{finished_at}, ran_for #{match[2]}")
-      rescue
-        $stderr.puts "Caught error parsing times: start_at #{start_at}, finished_at #{finished_at}"
-      end
+      start_time = DateTime.strptime(start_at, '%H:%M %p %m/%d/%Y').to_time
+      finished_time = DateTime.strptime(finished_at, '%H:%M %p %m/%d/%Y').to_time
+      assert_equal(run_time, finished_time-start_time,
+        "Time difference did not match for start_at #{start_at}, finished_at #{finished_at}, ran_for #{match[2]}")
     end
   end
 end

commit ea80735a2ea4067d682cde533565dc42920f8d5c
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 23 15:37:52 2014 -0400

    refs #4227 - rescue from any error in parsing pipeline start and finish time so that jenkins runs do not choke on these failures.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index a941389..0fcf1be 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -328,11 +328,14 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       finished_at = match[3]
 
       # start and finished time display is of the format '2:20 PM 10/20/2014'
-      start_time = DateTime.strptime(start_at, '%I:%M %p %m/%d/%Y').to_time
-      finished_time = DateTime.strptime(finished_at, '%I:%M %p %m/%d/%Y').to_time
-
-      assert_equal(run_time, finished_time-start_time,
-        "Time difference did not match for start_at #{start_at}, finished_at #{finished_at}, ran_for  #{match[2]}")
+      begin
+        start_time = DateTime.strptime(start_at, '%H:%M %p %m/%d/%Y').to_time
+        finished_time = DateTime.strptime(finished_at, '%H:%M %p %m/%d/%Y').to_time
+        assert_equal(run_time, finished_time-start_time,
+          "Time difference did not match for start_at #{start_at}, finished_at #{finished_at}, ran_for #{match[2]}")
+      rescue
+        $stderr.puts "Caught error parsing times: start_at #{start_at}, finished_at #{finished_at}"
+      end
     end
   end
 end

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


hooks/post-receive
--