[ARVADOS] updated: e74e37c42a38fbd985f35d58796ae008194e9d23

[git at public.curoverse.com]

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

       via  e74e37c42a38fbd985f35d58796ae008194e9d23 (commit)
      from  a1adf1ed6f93ce0769f307a86b6389e9e8e630a9 (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 e74e37c42a38fbd985f35d58796ae008194e9d23
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Dec 14 15:31:07 2015 -0500

    Small test cleanup.  refs #6429

diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index 7f4206b..f38fe56 100644
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -237,14 +237,14 @@ class ContainerRequestTest < ActiveSupport::TestCase
     cr.priority = 5
     cr.save!
 
-    c2 = ContainerRequest.new
-    c2.state = "Committed"
-    c2.container_image = "img"
-    c2.command = ["foo", "bar"]
-    c2.output_path = "/tmp"
-    c2.cwd = "/tmp"
-    c2.priority = 10
-    c2.save!
+    cr2 = ContainerRequest.new
+    cr2.state = "Committed"
+    cr2.container_image = "img"
+    cr2.command = ["foo", "bar"]
+    cr2.output_path = "/tmp"
+    cr2.cwd = "/tmp"
+    cr2.priority = 10
+    cr2.save!
 
     c = Container.find_by_uuid cr.container_uuid
     assert_equal 5, c.priority
@@ -340,15 +340,15 @@ class ContainerRequestTest < ActiveSupport::TestCase
     c = Container.find_by_uuid cr.container_uuid
     assert_equal 5, c.priority
 
-    c2 = ContainerRequest.new
-    c2.state = "Committed"
-    c2.container_image = "img"
-    c2.command = ["foo", "bar"]
-    c2.output_path = "/tmp"
-    c2.cwd = "/tmp"
-    c2.priority = 10
-    c2.requesting_container_uuid = c.uuid
-    c2.save!
+    cr2 = ContainerRequest.new
+    cr2.state = "Committed"
+    cr2.container_image = "img"
+    cr2.command = ["foo", "bar"]
+    cr2.output_path = "/tmp"
+    cr2.cwd = "/tmp"
+    cr2.priority = 10
+    cr2.requesting_container_uuid = c.uuid
+    cr2.save!
 
     c2 = Container.find_by_uuid c2.container_uuid
     assert_equal 10, c2.priority
@@ -361,6 +361,9 @@ class ContainerRequestTest < ActiveSupport::TestCase
     cr.reload
     assert_equal "Final", cr.state
 
+    cr2.reload
+    assert_equal 0, cr2.priority
+
     c2.reload
     assert_equal 0, c2.priority
   end

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


hooks/post-receive
--