[ARVADOS] updated: 849f35d1cafa1b58e55832426436689b95d69ac5

[Git user]

Summary of changes:
 services/api/app/models/container_request.rb     |  2 +-
 services/api/test/unit/container_request_test.rb | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

       via  849f35d1cafa1b58e55832426436689b95d69ac5 (commit)
       via  eb097927c63ac10900489b7728efcb639dd286b1 (commit)
      from  05428b719b804e68a17e07af0de00c0607d0be04 (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 849f35d1cafa1b58e55832426436689b95d69ac5
Merge: 05428b7 eb09792
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 14 11:19:53 2016 -0400

    closes #9970
    Merge branch '9970-requesting-container-at-create'


commit eb097927c63ac10900489b7728efcb639dd286b1
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 14 10:03:26 2016 -0400

    9970: Invalidate record if a requesting_container_uuid is provided at create.

diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index a56c341..be5792a 100644
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -248,7 +248,7 @@ class ContainerRequest < ArvadosModel
   end
 
   def set_requesting_container_uuid
-    return true if self.requesting_container_uuid   # already set
+    return !new_record? if self.requesting_container_uuid   # already set
 
     token_uuid = current_api_client_authorization.andand.uuid
     container = Container.where('auth_uuid=?', token_uuid).order('created_at desc').first
diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index ebd6a5a..7b7eef4 100644
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -242,7 +242,9 @@ class ContainerRequestTest < ActiveSupport::TestCase
     c = Container.find_by_uuid cr.container_uuid
     assert_equal 5, c.priority
 
-    cr2 = create_minimal_req!(priority: 10, state: "Committed", requesting_container_uuid: c.uuid)
+    cr2 = create_minimal_req!
+    cr2.update_attributes!(priority: 10, state: "Committed", requesting_container_uuid: c.uuid)
+    cr2.reload
 
     c2 = Container.find_by_uuid cr2.container_uuid
     assert_equal 10, c2.priority
@@ -395,4 +397,11 @@ class ContainerRequestTest < ActiveSupport::TestCase
     assert_not_empty Container.readable_by(users(:active)).where(uuid: containers(:running).uuid)
     assert_empty Container.readable_by(users(:spectator)).where(uuid: containers(:running).uuid)
   end
+
+  test "requesting_container_uuid at create is not allowed" do
+    set_user_from_auth :active
+    assert_raises(ActiveRecord::RecordNotSaved) do
+      create_minimal_req!(state: "Uncommitted", priority: 1, requesting_container_uuid: 'youcantdothat')
+    end
+  end
 end

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


hooks/post-receive
--