[ARVADOS] updated: e999e4e19e5619b485f5c4a2d1e993e187d63975

[git at public.curoverse.com]

Summary of changes:
 .../test/integration/pipeline_instances_test.rb    | 42 +++++++++++++------
 sdk/cli/bin/crunch-job                             | 49 +++++++++++++++-------
 2 files changed, 63 insertions(+), 28 deletions(-)

       via  e999e4e19e5619b485f5c4a2d1e993e187d63975 (commit)
       via  1bd8e9ed2c732b4cf80f255ef4babda69a1c0657 (commit)
       via  dd7bb176c565d0d0718f9b0e59a6d9ee4b8ecbf2 (commit)
       via  7a4f566c1a63ee37a88df16e25ca04e9a562fb1c (commit)
       via  b4c27edb438b8aec5f055b636afb476c6ea8284c (commit)
       via  2453adf513632740bc8a29f4d8b52789f4d8cd62 (commit)
       via  999cf322e35dfe147f7bab3204bf7c5b71e2e704 (commit)
      from  85add8b41d3469772af29b9a015f6c1f23cb8686 (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 e999e4e19e5619b485f5c4a2d1e993e187d63975
Merge: 1bd8e9e dd7bb17
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 7 13:26:18 2014 -0400

    Merge branch 'master' into 3990-owner-when-rerunning-pipeline


commit 1bd8e9ed2c732b4cf80f255ef4babda69a1c0657
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 7 13:17:33 2014 -0400

    3990: rerunning pipeline from within a project with no write permission

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index eb9b987..5ebf379 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -202,15 +202,18 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
   end
 
   [
-    [false, false, false],
-    [false, false, true],
-    [true, false, false],
-    [true, true, false],
-    [true, false, true],
-    [true, true, true],
-  ].each do |with_options, choose_options, in_aproject|
-    test "Rerun pipeline instance using options #{with_options} #{choose_options} in #{in_aproject}" do
-      visit page_with_token('active_trustedclient')
+    ['active', false, false, false],
+    ['active', false, false, true],
+    ['active', true, false, false],
+    ['active', true, true, false],
+    ['active', true, false, true],
+    ['active', true, true, true],
+    ['project_viewer', false, false, true],
+    ['project_viewer', true, false, true],
+    ['project_viewer', true, true, true],
+  ].each do |user, with_options, choose_options, in_aproject|
+    test "Rerun pipeline instance as #{user} using options #{with_options} #{choose_options} in #{in_aproject}" do
+      visit page_with_token('active')
 
       if in_aproject
         find("#projects-menu").click
@@ -220,13 +223,24 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       create_and_run_pipeline_in_aproject in_aproject
       instance_path = current_path
 
-      # pause the pipeline
+      # Pause the pipeline
       find('a,button', text: 'Pause').click
       assert page.has_text? 'Paused'
       page.assert_no_selector 'a.disabled,button.disabled', text: 'Resume'
       page.assert_selector 'a,button', text: 'Re-run with latest'
       page.assert_selector 'a,button', text: 'Re-run options'
 
+      # Pipeline can be re-run now. Access it as the specified user, and re-run
+      if user == 'project_viewer'
+        visit page_with_token(user)
+        visit instance_path
+        assert page.has_text? 'A Project'
+        page.assert_no_selector 'a.disabled,button.disabled', text: 'Resume'
+        page.assert_selector 'a,button', text: 'Re-run with latest'
+        page.assert_selector 'a,button', text: 'Re-run options'
+      end
+
+      # Now re-run the pipeline
       if with_options
         find('a,button', text: 'Re-run options').click
         within('.modal-dialog') do
@@ -242,12 +256,16 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
         find('a,button', text: 'Re-run with latest').click
       end
 
-      # verify that the newly created instance is in the expected project
+      # Verify that the newly created instance is created in the right project.
+      # In case of project_viewer user, since the use cannot write to the project,
+      # the pipeline should have been created in the user's Home project.
       rerun_instance_path = current_path
       assert_not_equal instance_path, rerun_instance_path, 'Rerun instance path expected to be different'
       assert page.has_text? 'Home'
-      if in_aproject
+      if in_aproject && (user != 'project_viewer')
         assert page.has_text? 'A Project'
+      else
+        assert page.has_no_text? 'A Project'
       end
     end
   end

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


hooks/post-receive
--