Merge branch 'master' into origin-8442-cwl-crunch2

[arvados.git] / services / api / test / fixtures / container_requests.yml

diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index 1e474bb98a0db16319a271cc8184826ee0f3a3e2..1e3d773550579b03a188d2ea129928cd457cf291 100644 (file)
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -13,11 +13,58 @@ queued:
   output_path: test
   command: ["echo", "hello"]
   container_uuid: zzzzz-dz642-queuedcontainer
-  requesting_container_uuid: zzzzz-dz642-requestingcntnr
+
+running:
+  uuid: zzzzz-xvhdp-cr4runningcntnr
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  name: running
+  state: Committed
+  priority: 1
+  created_at: 2016-01-11 11:11:11.111111111 Z
+  updated_at: 2016-01-11 11:11:11.111111111 Z
+  modified_at: 2016-01-11 11:11:11.111111111 Z
+  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  container_image: test
+  cwd: test
+  output_path: test
+  command: ["echo", "hello"]
+  container_uuid: zzzzz-dz642-runningcontainr
+
+running-older:
+  uuid: zzzzz-xvhdp-cr4runningcntn2
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  name: running
+  state: Committed
+  priority: 1
+  created_at: 2016-01-11 11:11:11.111111111 Z
+  updated_at: 2016-01-11 11:11:11.111111111 Z
+  modified_at: 2016-01-12 11:11:11.111111111 Z
+  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  container_image: test
+  cwd: test
+  output_path: test
+  command: ["echo", "hello"]
+  container_uuid: zzzzz-dz642-runningcontain2
 
 completed:
   uuid: zzzzz-xvhdp-cr4completedctr
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  name: completed container request
+  state: Final
+  priority: 1
+  created_at: <%= 2.minute.ago.to_s(:db) %>
+  updated_at: <%= 1.minute.ago.to_s(:db) %>
+  modified_at: <%= 1.minute.ago.to_s(:db) %>
+  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  container_image: test
+  cwd: test
+  output_path: test
+  command: ["echo", "hello"]
+  container_uuid: zzzzz-dz642-compltcontainer
+
+completed-older:
+  uuid: zzzzz-xvhdp-cr4completedcr2
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   name: completed
   state: Final
   priority: 1
@@ -29,14 +76,13 @@ completed:
   cwd: test
   output_path: test
   command: ["echo", "hello"]
-  container_uuid: zzzzz-dz642-compltcontainer
-  requesting_container_uuid: zzzzz-dz642-requestingcntnr
+  container_uuid: zzzzz-dz642-compltcontainr2
 
-running:
-  uuid: zzzzz-xvhdp-cr4runningcntnr
+cr_for_requester:
+  uuid: zzzzz-xvhdp-cr4requestercnt
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  name: running
-  state: Committed
+  name: requester_cr
+  state: Final
   priority: 1
   created_at: 2016-01-11 11:11:11.111111111 Z
   updated_at: 2016-01-11 11:11:11.111111111 Z
@@ -46,5 +92,21 @@ running:
   cwd: test
   output_path: test
   command: ["echo", "hello"]
-  container_uuid: zzzzz-dz642-requestingcntnr
+  container_uuid: zzzzz-dz642-requestercntnr1
   requesting_container_uuid: zzzzz-dz642-requestingcntnr
+
+cr_for_requester2:
+  uuid: zzzzz-xvhdp-cr4requestercn2
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  name: requester_cr2
+  state: Final
+  priority: 1
+  created_at: 2016-01-11 11:11:11.111111111 Z
+  updated_at: 2016-01-11 11:11:11.111111111 Z
+  modified_at: 2016-01-11 11:11:11.111111111 Z
+  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  container_image: test
+  cwd: test
+  output_path: test
+  command: ["echo", "hello"]
+  requesting_container_uuid: zzzzz-dz642-requestercntnr1