From: Lucas Di Pentima <lucas@curoverse.com>
Date: Mon, 12 Sep 2016 21:09:51 +0000 (-0300)
Subject: 9623: Restored changes to fixture file
X-Git-Tag: 1.1.0~731^2~8
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f137e22a65cc29d00146a4735fe54d72b299984b

9623: Restored changes to fixture file
---

diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index 1492dcc7ce..6df184253b 100644
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -7,6 +7,7 @@ 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:
@@ -18,12 +19,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:
@@ -31,17 +32,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:
@@ -63,21 +64,6 @@ locked:
     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:
-    ram: 12000000000
-    vcpus: 4
-
 completed:
   uuid: zzzzz-dz642-compltcontainer
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
@@ -90,6 +76,7 @@ completed:
   finished_at: 2016-01-12 11:12:13.111111111 Z
   container_image: test
   cwd: test
+  output: test
   log: ea10d51bcf88862dbcc36eb292017dfd+45
   output: zzzzz-4zz18-znfnqtbbv4spc3w
   output_path: test
@@ -111,7 +98,6 @@ completed_older:
   container_image: test
   cwd: test
   output: test
-  log: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints:
@@ -164,7 +150,6 @@ failed_container:
   container_image: test
   cwd: test
   output: test
-  log: test
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints: