12573: Test cleanup.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index e4c15ef3dbcb4dd505d991067ac45ce745555720..0edc0f45938cc07924150c365a77585ade65fc55 100644 (file)
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -108,7 +108,7 @@ class ContainerRequestTest < ActiveSupport::TestCase
 
   test "Container request priority must be non-nil" do
     set_user_from_auth :active
-    cr = create_minimal_req!(priority: nil)
+    cr = create_minimal_req!
     cr.priority = nil
     cr.state = "Committed"
     assert_raises(ActiveRecord::RecordInvalid) do

diff --git a/services/api/test/unit/container_test.rb b/services/api/test/unit/container_test.rb
index ab53240708e294d6aa1edb7aecd1e1ebdcf28fc8..eb4f35fea3d293c922d07fc6d16981f81b5092ee 100644 (file)
--- a/services/api/test/unit/container_test.rb
+++ b/services/api/test/unit/container_test.rb
@@ -95,37 +95,37 @@ class ContainerTest < ActiveSupport::TestCase
     end
   end
 
-  test "Container request valid priority" do
+  test "Container valid priority" do
     act_as_system_user do
-      cr, _ = minimal_new(environment: {},
+      c, _ = minimal_new(environment: {},
                       mounts: {"BAR" => "FOO"},
                       output_path: "/tmp",
                       priority: 1,
                       runtime_constraints: {"vcpus" => 1, "ram" => 1})
 
       assert_raises(ActiveRecord::RecordInvalid) do
-        cr.priority = -1
-        cr.save!
+        c.priority = -1
+        c.save!
       end
 
-      cr.priority = 0
-      cr.save!
+      c.priority = 0
+      c.save!
 
-      cr.priority = 1
-      cr.save!
+      c.priority = 1
+      c.save!
 
-      cr.priority = 500
-      cr.save!
+      c.priority = 500
+      c.save!
 
-      cr.priority = 999
-      cr.save!
+      c.priority = 999
+      c.save!
 
-      cr.priority = 1000
-      cr.save!
+      c.priority = 1000
+      c.save!
 
       assert_raises(ActiveRecord::RecordInvalid) do
-        cr.priority = 1001
-        cr.save!
+        c.priority = 1001
+        c.save!
       end
     end
   end