[ARVADOS] updated: 1.1.4-496-gb7acf6db5

[Git user]

Summary of changes:
 services/api/test/unit/container_request_test.rb | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

       via  b7acf6db5beab0b082c863fe5a9692d68152a132 (commit)
      from  0e94528878341faa941247eb3d990230c941868c (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 b7acf6db5beab0b082c863fe5a9692d68152a132
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Fri Jun 22 14:38:43 2018 -0300

    13649: Merges 2 tests into one.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index fc872e1d0..26a0048eb 100644
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -849,25 +849,6 @@ class ContainerRequestTest < ActiveSupport::TestCase
     end
   end
 
-  test "submit a Committed child CR with preemptible_instances active" do
-    attrs = {cwd: "test",
-             priority: 1,
-             state: ContainerRequest::Committed,
-             command: ["echo", "hello"],
-             output_path: "test",
-             mounts: {"test" => {"kind" => "json"}}}
-
-    Rails.configuration.preemptible_instances = true
-    set_user_from_auth :active
-
-    cr = with_container_auth(Container.find_by_uuid 'zzzzz-dz642-runningcontainr') do
-      create_minimal_req!(attrs)
-    end
-
-    assert_not_nil cr.requesting_container_uuid
-    assert_equal true, cr.scheduling_parameters['preemptible']
-  end
-
   [
     [{"partitions" => ["fastcpu","vfastcpu", 100]}, ContainerRequest::Committed, ActiveRecord::RecordInvalid],
     [{"partitions" => ["fastcpu","vfastcpu", 100]}, ContainerRequest::Uncommitted],
@@ -913,6 +894,7 @@ class ContainerRequestTest < ActiveSupport::TestCase
     cr = with_container_auth(Container.find_by_uuid 'zzzzz-dz642-runningcontainr') do
       create_minimal_req!(common_attrs)
     end
+    assert_equal 'zzzzz-dz642-runningcontainr', cr.requesting_container_uuid
     assert_equal true, cr.scheduling_parameters["preemptible"]
 
     c = Container.find_by_uuid(cr.container_uuid)

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


hooks/post-receive
--