projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9799-nonadmin-logs'
[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..2e3021d374cdd7b78b6f7f06e0ce36ef40b1a5a4 100644
(file)
--- a/
services/api/test/fixtures/containers.yml
+++ b/
services/api/test/fixtures/containers.yml
@@
-1,6
+1,6
@@
queued:
uuid: zzzzz-dz642-queuedcontainer
queued:
uuid: zzzzz-dz642-queuedcontainer
- owner_uuid: zzzzz-tpzed-
xurymjxw79nv3jz
+ owner_uuid: zzzzz-tpzed-
000000000000000
state: Queued
priority: 1
created_at: 2016-01-11 11:11:11.111111111 Z
state: Queued
priority: 1
created_at: 2016-01-11 11:11:11.111111111 Z
@@
-16,8
+16,7
@@
queued:
running:
uuid: zzzzz-dz642-runningcontainr
running:
uuid: zzzzz-dz642-runningcontainr
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Running
+ owner_uuid: zzzzz-tpzed-000000000000000
priority: 1
created_at: <%= 1.minute.ago.to_s(:db) %>
updated_at: <%= 1.minute.ago.to_s(:db) %>
priority: 1
created_at: <%= 1.minute.ago.to_s(:db) %>
updated_at: <%= 1.minute.ago.to_s(:db) %>
@@
-32,9
+31,9
@@
running:
vcpus: 4
auth_uuid: zzzzz-gj3su-077z32aux8dg2s1
vcpus: 4
auth_uuid: zzzzz-gj3su-077z32aux8dg2s1
-running
-
older:
+running
_
older:
uuid: zzzzz-dz642-runningcontain2
uuid: zzzzz-dz642-runningcontain2
- owner_uuid: zzzzz-tpzed-
xurymjxw79nv3jz
+ owner_uuid: zzzzz-tpzed-
000000000000000
state: Running
priority: 1
created_at: <%= 2.minute.ago.to_s(:db) %>
state: Running
priority: 1
created_at: <%= 2.minute.ago.to_s(:db) %>
@@
-51,7
+50,7
@@
running-older:
locked:
uuid: zzzzz-dz642-lockedcontainer
locked:
uuid: zzzzz-dz642-lockedcontainer
- owner_uuid: zzzzz-tpzed-
xurymjxw79nv3jz
+ owner_uuid: zzzzz-tpzed-
000000000000000
state: Locked
priority: 2
created_at: <%= 2.minute.ago.to_s(:db) %>
state: Locked
priority: 2
created_at: <%= 2.minute.ago.to_s(:db) %>
@@
-67,7
+66,7
@@
locked:
completed:
uuid: zzzzz-dz642-compltcontainer
completed:
uuid: zzzzz-dz642-compltcontainer
- owner_uuid: zzzzz-tpzed-
xurymjxw79nv3jz
+ owner_uuid: zzzzz-tpzed-
000000000000000
state: Complete
exit_code: 0
priority: 1
state: Complete
exit_code: 0
priority: 1
@@
-87,7
+86,7
@@
completed:
completed_older:
uuid: zzzzz-dz642-compltcontainr2
completed_older:
uuid: zzzzz-dz642-compltcontainr2
- owner_uuid: zzzzz-tpzed-
xurymjxw79nv3jz
+ owner_uuid: zzzzz-tpzed-
000000000000000
state: Complete
exit_code: 0
priority: 1
state: Complete
exit_code: 0
priority: 1
@@
-106,7
+105,7
@@
completed_older:
requester:
uuid: zzzzz-dz642-requestingcntnr
requester:
uuid: zzzzz-dz642-requestingcntnr
- owner_uuid: zzzzz-tpzed-
xurymjxw79nv3jz
+ owner_uuid: zzzzz-tpzed-
000000000000000
state: Complete
exit_code: 0
priority: 1
state: Complete
exit_code: 0
priority: 1
@@
-123,7
+122,7
@@
requester:
requester_container:
uuid: zzzzz-dz642-requestercntnr1
requester_container:
uuid: zzzzz-dz642-requestercntnr1
- owner_uuid: zzzzz-tpzed-
xurymjxw79nv3jz
+ owner_uuid: zzzzz-tpzed-
000000000000000
state: Complete
exit_code: 0
priority: 1
state: Complete
exit_code: 0
priority: 1