projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21765-short-dialog'
[arvados.git]
/
services
/
api
/
test
/
unit
/
container_request_test.rb
diff --git
a/services/api/test/unit/container_request_test.rb
b/services/api/test/unit/container_request_test.rb
index 98136aa53b5c127e5012eb5aa6cf88c03357d1d5..fa7910d597de2d0f38e8a24c56683503d37257e4 100644
(file)
--- a/
services/api/test/unit/container_request_test.rb
+++ b/
services/api/test/unit/container_request_test.rb
@@
-112,11
+112,15
@@
class ContainerRequestTest < ActiveSupport::TestCase
{"mounts" => {"FOO" => {}}},
{"mounts" => {"FOO" => {"kind" => "tmp", "capacity" => 42.222}}},
{"command" => ["echo", 55]},
{"mounts" => {"FOO" => {}}},
{"mounts" => {"FOO" => {"kind" => "tmp", "capacity" => 42.222}}},
{"command" => ["echo", 55]},
- {"environment" => {"FOO" => 55}}
+ {"environment" => {"FOO" => 55}},
+ {"output_glob" => [false]},
+ {"output_glob" => [["bad"]]},
+ {"output_glob" => "bad"},
+ {"output_glob" => ["nope", -1]},
].each do |value|
test "Create with invalid #{value}" do
set_user_from_auth :active
].each do |value|
test "Create with invalid #{value}" do
set_user_from_auth :active
- assert_raises(ActiveRecord::RecordInvalid) do
+ assert_raises(ActiveRecord::RecordInvalid
, Serializer::TypeMismatch
) do
cr = create_minimal_req!({state: "Committed",
priority: 1}.merge(value))
cr.save!
cr = create_minimal_req!({state: "Committed",
priority: 1}.merge(value))
cr.save!
@@
-127,7
+131,7
@@
class ContainerRequestTest < ActiveSupport::TestCase
set_user_from_auth :active
cr = create_minimal_req!(state: "Uncommitted", priority: 1)
cr.save!
set_user_from_auth :active
cr = create_minimal_req!(state: "Uncommitted", priority: 1)
cr.save!
- assert_raises(ActiveRecord::RecordInvalid) do
+ assert_raises(ActiveRecord::RecordInvalid
, Serializer::TypeMismatch
) do
cr = ContainerRequest.find_by_uuid cr.uuid
cr.update!({state: "Committed",
priority: 1}.merge(value))
cr = ContainerRequest.find_by_uuid cr.uuid
cr.update!({state: "Committed",
priority: 1}.merge(value))
@@
-1131,13
+1135,13
@@
class ContainerRequestTest < ActiveSupport::TestCase
assert_equal ContainerRequest::Final, cr.state
output_coll = Collection.find_by_uuid(cr.output_uuid)
# Make sure the resulting output collection name include the original name
assert_equal ContainerRequest::Final, cr.state
output_coll = Collection.find_by_uuid(cr.output_uuid)
# Make sure the resulting output collection name include the original name
- # plus the
date
+ # plus the
last 15 characters of uuid
assert_not_equal output_name, output_coll.name,
"more than one collection with the same owner and name"
assert output_coll.name.include?(output_name),
"New name should include original name"
assert_not_equal output_name, output_coll.name,
"more than one collection with the same owner and name"
assert output_coll.name.include?(output_name),
"New name should include original name"
- assert_match /
\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+Z
/, output_coll.name,
- "New name should include
ISO8601 date
"
+ assert_match /
#{output_coll.uuid[-15..-1]}
/, output_coll.name,
+ "New name should include
last 15 characters of uuid
"
end
[[0, :check_output_ttl_0],
end
[[0, :check_output_ttl_0],