[ARVADOS] updated: 8a88b30e4b9253cd4f73cd3c620eafc026bb5979

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/collections_controller.rb      | 19 ++---
 apps/workbench/app/helpers/provenance_helper.rb    | 13 +++-
 .../test/functional/collections_controller_test.rb | 16 ++++
 apps/workbench/test/integration/jobs_test.rb       | 33 +++-----
 apps/workbench/test/test_helper.rb                 |  9 ++-
 sdk/cli/bin/crunch-job                             | 88 ++++++++++++++++++----
 services/api/test/unit/job_test.rb                 |  6 +-
 7 files changed, 130 insertions(+), 54 deletions(-)

       via  8a88b30e4b9253cd4f73cd3c620eafc026bb5979 (commit)
       via  e3dbac204099a08a68385016c3ce30bbbda67ba1 (commit)
       via  c6b14938cfb90145dfcf9a8e5ea7264d63ac8035 (commit)
       via  7c2d0c899c11de4d52a417e857f4ae8f968ec628 (commit)
       via  d65963976174bd9c94fdb0b91eeb8a281f01e7b3 (commit)
       via  41190e074c3c4504b7627757250a1b188b86b54e (commit)
       via  2a34da95f13c361ef32d7bfba477b0de54c38cb0 (commit)
       via  ec9360b6e787b8e252d7f6ee6269e1241a4beacb (commit)
       via  5d0474c43296f2bac56c5b40e1d50ab0022a28b1 (commit)
       via  c76954b90045782599660a069d01efca53d026a5 (commit)
       via  07f98aa421dd6b1cbe82817ca9d8540dba42f604 (commit)
       via  3e2927123ab9c6c8ab48b50ed65490f809e9e18a (commit)
       via  8f6d2653d4ae4ce84f8e6699d0483bd2a9885f79 (commit)
       via  35729f8faeae665e5a706d56cfacf01e76de99a9 (commit)
       via  f19ce869a14511bb8031309a75fd9ee7acfeee6c (commit)
       via  f0358d88ba065369e70a89205ca1ad4ea4700cd1 (commit)
       via  257004f6162498831d1e47b81514e3311facde3b (commit)
       via  0e01a46b111ee565c236f3be8d8fed894fc35a5e (commit)
       via  1779b8427b66ae59340570f37c8f34e9ef2228f4 (commit)
      from  bbec60169a83a0022061201758a04b3c6023957a (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 8a88b30e4b9253cd4f73cd3c620eafc026bb5979
Merge: e3dbac2 c6b1493
Author: radhika <radhika at curoverse.com>
Date:   Mon Oct 6 14:51:20 2014 -0400

    Merge branch 'master' into 4046-job-queue-position


commit e3dbac204099a08a68385016c3ce30bbbda67ba1
Author: radhika <radhika at curoverse.com>
Date:   Mon Oct 6 14:47:43 2014 -0400

    4046: update assert error message

diff --git a/services/api/test/unit/job_test.rb b/services/api/test/unit/job_test.rb
index 1fbaf6c..cf1e26c 100644
--- a/services/api/test/unit/job_test.rb
+++ b/services/api/test/unit/job_test.rb
@@ -270,15 +270,15 @@ class JobTest < ActiveSupport::TestCase
   test "verify job queue position" do
     job1 = Job.create! job_attrs
     assert job1.valid?, job1.errors.full_messages.to_s
-    assert_equal 'Queued', job1.state, "job.state"
+    assert_equal 'Queued', job1.state, "Incorrect job state for newly created job1"
 
     job2 = Job.create! job_attrs
     assert job2.valid?, job2.errors.full_messages.to_s
-    assert_equal 'Queued', job2.state, "job.state"
+    assert_equal 'Queued', job2.state, "Incorrect job state for newly created job2"
 
     assert_not_nil job1.queue_position, "Expected non-nil queue position for job1"
     assert_not_nil job2.queue_position, "Expected non-nil queue position for job2"
     assert_not_equal job1.queue_position, job2.queue_position
   end
- 
+
 end

commit 7c2d0c899c11de4d52a417e857f4ae8f968ec628
Merge: bbec601 d659639
Author: radhika <radhika at curoverse.com>
Date:   Mon Oct 6 14:30:52 2014 -0400

    Merge branch 'master' into 4046-job-queue-position


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


hooks/post-receive
--