9623: Removed fixtures additions meant for Container reuse tests because some of...

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

diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index 049cd3c6db0307d7ce029f641f8dc93fb8ce917e..1492dcc7cef91cc7224d34c18f499a77e12dae19 100644 (file)
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -7,7 +7,6 @@ queued:
   updated_at: 2016-01-11 11:11:11.111111111 Z
   container_image: test
   cwd: test
-  output: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints:
@@ -19,12 +18,12 @@ running:
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   state: Running
   priority: 1
+  progress: 10.0
   created_at: <%= 1.minute.ago.to_s(:db) %>
   updated_at: <%= 1.minute.ago.to_s(:db) %>
   started_at: <%= 1.minute.ago.to_s(:db) %>
   container_image: test
   cwd: test
-  output: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints:
@@ -32,17 +31,17 @@ running:
     vcpus: 4
   auth_uuid: zzzzz-gj3su-077z32aux8dg2s1
 
-running-older:
+running_older:
   uuid: zzzzz-dz642-runningcontain2
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   state: Running
   priority: 1
+  progress: 15.0
   created_at: <%= 2.minute.ago.to_s(:db) %>
   updated_at: <%= 2.minute.ago.to_s(:db) %>
   started_at: <%= 2.minute.ago.to_s(:db) %>
   container_image: test
   cwd: test
-  output: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints:
@@ -58,7 +57,21 @@ locked:
   updated_at: <%= 2.minute.ago.to_s(:db) %>
   container_image: test
   cwd: test
-  output: test
+  output_path: test
+  command: ["echo", "hello"]
+  runtime_constraints:
+    ram: 12000000000
+    vcpus: 4
+
+locked_higher_priority:
+  uuid: zzzzz-dz642-lockedcontainerhigher
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  state: Locked
+  priority: 3
+  created_at: <%= 2.minute.ago.to_s(:db) %>
+  updated_at: <%= 2.minute.ago.to_s(:db) %>
+  container_image: test
+  cwd: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints:
@@ -98,6 +111,7 @@ completed_older:
   container_image: test
   cwd: test
   output: test
+  log: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints:
@@ -150,6 +164,7 @@ failed_container:
   container_image: test
   cwd: test
   output: test
+  log: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints: