20300: Update time.to_s(:db) to to_fs(:db).

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index a5c3e63dde65ffcd935b016b7f255d6effffbe0e..5a3242e4ffce028bb95df3e9beaaa36f9bf5059f 100644 (file)
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -1128,8 +1128,8 @@ collection_<%=i%>_of_10:
   uuid: zzzzz-4zz18-10gneyn6brkx<%= i.to_s.rjust(3, '0') %>
   current_version_uuid: zzzzz-4zz18-10gneyn6brkx<%= i.to_s.rjust(3, '0') %>
   owner_uuid: zzzzz-j7d0g-0010collections
-  created_at: <%= i.minute.ago.to_s(:db) %>
-  modified_at: <%= i.minute.ago.to_s(:db) %>
+  created_at: <%= i.minute.ago.to_fs(:db) %>
+  modified_at: <%= i.minute.ago.to_fs(:db) %>
 <% end %>
 
 # collections in project_with_201_collections
@@ -1141,8 +1141,8 @@ collection_<%=i%>_of_201:
   uuid: zzzzz-4zz18-201gneyn6brd<%= i.to_s.rjust(3, '0') %>
   current_version_uuid: zzzzz-4zz18-201gneyn6brd<%= i.to_s.rjust(3, '0') %>
   owner_uuid: zzzzz-j7d0g-0201collections
-  created_at: <%= i.minute.ago.to_s(:db) %>
-  modified_at: <%= i.minute.ago.to_s(:db) %>
+  created_at: <%= i.minute.ago.to_fs(:db) %>
+  modified_at: <%= i.minute.ago.to_fs(:db) %>
 <% end %>
 
 # Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper

diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index cc5aedf5e6b35923a62285055fccdbdd848888a4..71c7a54df3981eb531f0b36d28788aa3a6d29247 100644 (file)
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -8,9 +8,9 @@ queued:
   name: queued
   state: Committed
   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) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  modified_at: <%= 1.minute.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -32,9 +32,9 @@ running:
   name: running
   state: Committed
   priority: 501
-  created_at: <%= 2.minute.ago.to_s(:db) %>
-  updated_at: <%= 1.minute.ago.to_s(:db) %>
-  modified_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  modified_at: <%= 1.minute.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -55,9 +55,9 @@ requester_for_running:
   name: requester_for_running_cr
   state: Committed
   priority: 1
-  created_at: <%= 2.minute.ago.to_s(:db) %>
-  updated_at: <%= 2.minute.ago.to_s(:db) %>
-  modified_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 2.minute.ago.to_fs(:db) %>
+  modified_at: <%= 2.minute.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -102,9 +102,9 @@ completed:
   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) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  modified_at: <%= 1.minute.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -124,7 +124,7 @@ completed-older:
   name: completed
   state: Final
   priority: 1
-  created_at: <%= 30.minute.ago.to_s(:db) %>
+  created_at: <%= 30.minute.ago.to_fs(:db) %>
   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
@@ -413,7 +413,7 @@ cr_for_requester2:
   name: requester_cr2
   state: Final
   priority: 1
-  created_at: <%= 30.minute.ago.to_s(:db) %>
+  created_at: <%= 30.minute.ago.to_fs(:db) %>
   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
@@ -539,9 +539,9 @@ running_to_be_deleted:
   name: running to be deleted
   state: Committed
   priority: 1
-  created_at: <%= 2.days.ago.to_s(:db) %>
-  updated_at: <%= 1.days.ago.to_s(:db) %>
-  modified_at: <%= 1.days.ago.to_s(:db) %>
+  created_at: <%= 2.days.ago.to_fs(:db) %>
+  updated_at: <%= 1.days.ago.to_fs(:db) %>
+  modified_at: <%= 1.days.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -562,9 +562,9 @@ completed_with_input_mounts:
   name: completed container request
   state: Final
   priority: 1
-  created_at: <%= 24.hour.ago.to_s(:db) %>
-  updated_at: <%= 24.hour.ago.to_s(:db) %>
-  modified_at: <%= 24.hour.ago.to_s(:db) %>
+  created_at: <%= 24.hour.ago.to_fs(:db) %>
+  updated_at: <%= 24.hour.ago.to_fs(:db) %>
+  modified_at: <%= 24.hour.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -598,9 +598,9 @@ uncommitted:
   uuid: zzzzz-xvhdp-cr4uncommittedc
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   name: uncommitted
-  created_at: <%= 2.minute.ago.to_s(:db) %>
-  updated_at: <%= 1.minute.ago.to_s(:db) %>
-  modified_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  modified_at: <%= 1.minute.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   command: ["arvados-cwl-runner", "--local", "--api=containers",
             "/var/lib/cwl/workflow.json", "/var/lib/cwl/cwl.input.json"]
@@ -1019,9 +1019,9 @@ cr_in_trashed_project:
   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) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  modified_at: <%= 1.minute.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -1041,9 +1041,9 @@ runtime_token:
   name: queued
   state: Committed
   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) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  modified_at: <%= 1.minute.ago.to_fs(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -1065,7 +1065,7 @@ runtime_token:
 <% for i in 1..60 do %>
 cr_<%=i%>_of_60:
   uuid: zzzzz-xvhdp-oneof60crs<%= i.to_s.rjust(5, '0') %>
-  created_at: <%= ((i+5)/5).hour.ago.to_s(:db) %>
+  created_at: <%= ((i+5)/5).hour.ago.to_fs(:db) %>
   owner_uuid: zzzzz-j7d0g-nnncrspipelines
   name: cr-<%= i.to_s %>
   output_path: test

diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index 703d2aafbe5edeeda830cd36cf250ee13e831477..46bc1e50f9da3bdbc417fef55116c74601e7c319 100644 (file)
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -33,9 +33,9 @@ running:
   owner_uuid: zzzzz-tpzed-000000000000000
   state: Running
   priority: 12
-  created_at: <%= 1.minute.ago.to_s(:db) %>
-  updated_at: <%= 1.minute.ago.to_s(:db) %>
-  started_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  started_at: <%= 1.minute.ago.to_fs(:db) %>
   container_image: test
   cwd: /tmp
   output_path: /tmp
@@ -59,9 +59,9 @@ running_older:
   owner_uuid: zzzzz-tpzed-000000000000000
   state: Running
   priority: 1
-  created_at: <%= 2.minute.ago.to_s(:db) %>
-  updated_at: <%= 2.minute.ago.to_s(:db) %>
-  started_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 2.minute.ago.to_fs(:db) %>
+  started_at: <%= 2.minute.ago.to_fs(:db) %>
   container_image: test
   cwd: /tmp
   output_path: /tmp
@@ -82,9 +82,9 @@ locked:
   state: Locked
   locked_by_uuid: zzzzz-gj3su-k9dvestay1plssr
   priority: 0
-  created_at: <%= 2.minute.ago.to_s(:db) %>
-  updated_at: <%= 2.minute.ago.to_s(:db) %>
-  modified_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  updated_at: <%= 2.minute.ago.to_fs(:db) %>
+  modified_at: <%= 2.minute.ago.to_fs(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -353,8 +353,8 @@ ancient_container_with_logs:
   state: Complete
   exit_code: 0
   priority: 1
-  created_at: <%= 2.year.ago.to_s(:db) %>
-  updated_at: <%= 2.year.ago.to_s(:db) %>
+  created_at: <%= 2.year.ago.to_fs(:db) %>
+  updated_at: <%= 2.year.ago.to_fs(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -362,7 +362,7 @@ ancient_container_with_logs:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  finished_at: <%= 2.year.ago.to_s(:db) %>
+  finished_at: <%= 2.year.ago.to_fs(:db) %>
   log: ea10d51bcf88862dbcc36eb292017dfd+45
   output: test
   secret_mounts: {}
@@ -374,8 +374,8 @@ previous_container_with_logs:
   state: Complete
   exit_code: 0
   priority: 1
-  created_at: <%= 1.month.ago.to_s(:db) %>
-  updated_at: <%= 1.month.ago.to_s(:db) %>
+  created_at: <%= 1.month.ago.to_fs(:db) %>
+  updated_at: <%= 1.month.ago.to_fs(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -383,7 +383,7 @@ previous_container_with_logs:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  finished_at: <%= 1.month.ago.to_s(:db) %>
+  finished_at: <%= 1.month.ago.to_fs(:db) %>
   log: ea10d51bcf88862dbcc36eb292017dfd+45
   output: test
   secret_mounts: {}
@@ -394,8 +394,8 @@ running_container_with_logs:
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   state: Running
   priority: 1
-  created_at: <%= 1.hour.ago.to_s(:db) %>
-  updated_at: <%= 1.hour.ago.to_s(:db) %>
+  created_at: <%= 1.hour.ago.to_fs(:db) %>
+  updated_at: <%= 1.hour.ago.to_fs(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -416,9 +416,9 @@ running_to_be_deleted:
   owner_uuid: zzzzz-tpzed-000000000000000
   state: Running
   priority: 1
-  created_at: <%= 1.minute.ago.to_s(:db) %>
-  updated_at: <%= 1.minute.ago.to_s(:db) %>
-  started_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
+  updated_at: <%= 1.minute.ago.to_fs(:db) %>
+  started_at: <%= 1.minute.ago.to_fs(:db) %>
   container_image: test
   cwd: test
   output_path: test

diff --git a/services/api/test/fixtures/job_tasks.yml b/services/api/test/fixtures/job_tasks.yml
index 7131da6f5ee6dc54906745b1b2ac56d1d7223f7e..6a857a02f29dfe8f60286014cecc3191fd434f04 100644 (file)
--- a/services/api/test/fixtures/job_tasks.yml
+++ b/services/api/test/fixtures/job_tasks.yml
@@ -5,11 +5,11 @@
 running_job_task_1:
   uuid: zzzzz-ot0gb-runningjobtask1
   owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
-  created_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 3.minute.ago.to_fs(:db) %>
   job_uuid: zzzzz-8i9sb-with2components
 
 running_job_task_2:
   uuid: zzzzz-ot0gb-runningjobtask2
   owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
-  created_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 3.minute.ago.to_fs(:db) %>
   job_uuid: zzzzz-8i9sb-with2components

diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml
index 9280aeab935e19748f25ea347592d3d704161f02..54b38259ba889aa84a28518738865ca5ea88bb5f 100644 (file)
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -8,8 +8,8 @@ running:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 2.7.minute.ago.to_s(:db) %>
-  started_at: <%= 2.7.minute.ago.to_s(:db) %>
+  created_at: <%= 2.7.minute.ago.to_fs(:db) %>
+  started_at: <%= 2.7.minute.ago.to_fs(:db) %>
   finished_at: ~
   script: hash
   repository: active/foo
@@ -32,11 +32,11 @@ running:
 running_cancelled:
   uuid: zzzzz-8i9sb-4cf0nhn6xte809j
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  cancelled_at: <%= 1.minute.ago.to_s(:db) %>
+  cancelled_at: <%= 1.minute.ago.to_fs(:db) %>
   cancelled_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   cancelled_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
-  created_at: <%= 4.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 4.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
   finished_at: ~
   script: hash
   repository: active/foo
@@ -63,9 +63,9 @@ uses_nonexistent_script_version:
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
   script_version: 7def43a4d3f20789dda4700f703b5514cc3ed250
-  created_at: <%= 5.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
-  finished_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 5.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
+  finished_at: <%= 2.minute.ago.to_fs(:db) %>
   script: hash
   repository: active/foo
   running: false
@@ -94,9 +94,9 @@ foobar:
   script_version: 7def43a4d3f20789dda4700f703b5514cc3ed250
   script_parameters:
     input: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
-  created_at: <%= 4.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
-  finished_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 4.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
+  finished_at: <%= 2.minute.ago.to_fs(:db) %>
   running: false
   success: true
   output: fa7aeb5140e2848d39b416daeef4ffc5+45
@@ -122,9 +122,9 @@ barbaz:
   script_parameters:
     input: fa7aeb5140e2848d39b416daeef4ffc5+45
     an_integer: 1
-  created_at: <%= 4.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
-  finished_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 4.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
+  finished_at: <%= 2.minute.ago.to_fs(:db) %>
   running: false
   success: true
   repository: active/foo
@@ -151,9 +151,9 @@ runningbarbaz:
   script_parameters:
     input: fa7aeb5140e2848d39b416daeef4ffc5+45
     an_integer: 1
-  created_at: <%= 4.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
-  finished_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 4.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
+  finished_at: <%= 2.minute.ago.to_fs(:db) %>
   running: true
   success: ~
   repository: active/foo
@@ -172,8 +172,8 @@ runningbarbaz:
 
 previous_job_run:
   uuid: zzzzz-8i9sb-cjs4pklxxjykqqq
-  created_at: <%= 14.minute.ago.to_s(:db) %>
-  finished_at: <%= 13.minutes.ago.to_s(:db) %>
+  created_at: <%= 14.minute.ago.to_fs(:db) %>
+  finished_at: <%= 13.minutes.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash
@@ -189,8 +189,8 @@ previous_job_run:
 
 previous_job_run_nil_log:
   uuid: zzzzz-8i9sb-cjs4pklxxjykqq3
-  created_at: <%= 14.minute.ago.to_s(:db) %>
-  finished_at: <%= 13.minutes.ago.to_s(:db) %>
+  created_at: <%= 14.minute.ago.to_fs(:db) %>
+  finished_at: <%= 13.minutes.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash
@@ -206,8 +206,8 @@ previous_job_run_nil_log:
 
 previous_ancient_job_run:
   uuid: zzzzz-8i9sb-ahd7cie8jah9qui
-  created_at: <%= 366.days.ago.to_s(:db) %>
-  finished_at: <%= 365.days.ago.to_s(:db) %>
+  created_at: <%= 366.days.ago.to_fs(:db) %>
+  finished_at: <%= 365.days.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash
@@ -223,7 +223,7 @@ previous_ancient_job_run:
 
 previous_docker_job_run:
   uuid: zzzzz-8i9sb-k6emstgk4kw4yhi
-  created_at: <%= 14.minute.ago.to_s(:db) %>
+  created_at: <%= 14.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash
@@ -242,7 +242,7 @@ previous_docker_job_run:
 
 previous_ancient_docker_image_job_run:
   uuid: zzzzz-8i9sb-t3b460aolxxuldl
-  created_at: <%= 144.minute.ago.to_s(:db) %>
+  created_at: <%= 144.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash
@@ -260,7 +260,7 @@ previous_ancient_docker_image_job_run:
 
 previous_job_run_with_arvados_sdk_version:
   uuid: zzzzz-8i9sb-eoo0321or2dw2jg
-  created_at: <%= 14.minute.ago.to_s(:db) %>
+  created_at: <%= 14.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash
@@ -281,7 +281,7 @@ previous_job_run_with_arvados_sdk_version:
 
 previous_job_run_no_output:
   uuid: zzzzz-8i9sb-cjs4pklxxjykppp
-  created_at: <%= 14.minute.ago.to_s(:db) %>
+  created_at: <%= 14.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash
@@ -297,7 +297,7 @@ previous_job_run_no_output:
 previous_job_run_superseded_by_hash_branch:
   # This supplied_script_version is a branch name with later commits.
   uuid: zzzzz-8i9sb-aeviezu5dahph3e
-  created_at: <%= 15.minute.ago.to_s(:db) %>
+  created_at: <%= 15.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/shabranchnames
   script: testscript
@@ -311,7 +311,7 @@ previous_job_run_superseded_by_hash_branch:
 
 nondeterminisic_job_run:
   uuid: zzzzz-8i9sb-cjs4pklxxjykyyy
-  created_at: <%= 14.minute.ago.to_s(:db) %>
+  created_at: <%= 14.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: active/foo
   script: hash2
@@ -326,14 +326,14 @@ nondeterminisic_job_run:
 
 nearly_finished_job:
   uuid: zzzzz-8i9sb-2gx6rz0pjl033w3
-  created_at: <%= 14.minute.ago.to_s(:db) %>
+  created_at: <%= 14.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   repository: arvados
   script: doesnotexist
   script_version: 309e25a64fe994867db8459543af372f850e25b9
   script_parameters:
     input: b519d9cb706a29fc7ea24dbea2f05851+249025
-  started_at: <%= 3.minute.ago.to_s(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
   finished_at: ~
   running: true
   success: ~
@@ -348,7 +348,7 @@ nearly_finished_job:
 
 queued:
   uuid: zzzzz-8i9sb-grx15v5mjnsyxk7
-  created_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   cancelled_at: ~
   cancelled_by_user_uuid: ~
@@ -382,11 +382,11 @@ job_with_real_log:
 cancelled:
   uuid: zzzzz-8i9sb-4cf0abc123e809j
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  cancelled_at: <%= 1.minute.ago.to_s(:db) %>
+  cancelled_at: <%= 1.minute.ago.to_fs(:db) %>
   cancelled_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   cancelled_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
-  created_at: <%= 4.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 4.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
   finished_at: ~
   script_version: 1de84a854e2b440dc53bf42f8548afa4c17da332
   running: false
@@ -432,8 +432,8 @@ running_will_be_completed:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 3.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 3.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
   finished_at: ~
   script_version: 1de84a854e2b440dc53bf42f8548afa4c17da332
   running: true
@@ -499,9 +499,9 @@ job_with_latest_version:
   supplied_script_version: main
   script_parameters:
     input: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
-  created_at: <%= 3.minute.ago.to_s(:db) %>
-  started_at: <%= 2.minute.ago.to_s(:db) %>
-  finished_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 3.minute.ago.to_fs(:db) %>
+  started_at: <%= 2.minute.ago.to_fs(:db) %>
+  finished_at: <%= 1.minute.ago.to_fs(:db) %>
   running: false
   success: true
   output: fa7aeb5140e2848d39b416daeef4ffc5+45
@@ -544,8 +544,8 @@ completed_job_in_publicly_accessible_project:
   log: zzzzz-4zz18-4en62shvi99lxd4
   output: b519d9cb706a29fc7ea24dbea2f05851+93
   script_parameters_digest: 02a085407e751d00b5dc88f1bd5e8247
-  started_at: <%= 10.minute.ago.to_s(:db) %>
-  finished_at: <%= 5.minute.ago.to_s(:db) %>
+  started_at: <%= 10.minute.ago.to_fs(:db) %>
+  finished_at: <%= 5.minute.ago.to_fs(:db) %>
 
 job_in_publicly_accessible_project_but_other_objects_elsewhere:
   uuid: zzzzz-8i9sb-jyq01muyhgr4ofj
@@ -568,8 +568,8 @@ running_job_with_components:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 3.minute.ago.to_s(:db) %>
-  started_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 3.minute.ago.to_fs(:db) %>
+  started_at: <%= 3.minute.ago.to_fs(:db) %>
   finished_at: ~
   script: hash
   repository: active/foo
@@ -599,8 +599,8 @@ running_job_with_components_at_level_1:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 12.hour.ago.to_s(:db) %>
-  started_at: <%= 12.hour.ago.to_s(:db) %>
+  created_at: <%= 12.hour.ago.to_fs(:db) %>
+  started_at: <%= 12.hour.ago.to_fs(:db) %>
   finished_at: ~
   repository: active/foo
   script: hash
@@ -630,8 +630,8 @@ running_job_with_components_at_level_2:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 12.hour.ago.to_s(:db) %>
-  started_at: <%= 12.hour.ago.to_s(:db) %>
+  created_at: <%= 12.hour.ago.to_fs(:db) %>
+  started_at: <%= 12.hour.ago.to_fs(:db) %>
   finished_at: ~
   repository: active/foo
   script: hash
@@ -660,8 +660,8 @@ running_job_1_with_components_at_level_3:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 12.hour.ago.to_s(:db) %>
-  started_at: <%= 12.hour.ago.to_s(:db) %>
+  created_at: <%= 12.hour.ago.to_fs(:db) %>
+  started_at: <%= 12.hour.ago.to_fs(:db) %>
   finished_at: ~
   repository: active/foo
   script: hash
@@ -687,8 +687,8 @@ running_job_2_with_components_at_level_3:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 12.hour.ago.to_s(:db) %>
-  started_at: <%= 12.hour.ago.to_s(:db) %>
+  created_at: <%= 12.hour.ago.to_fs(:db) %>
+  started_at: <%= 12.hour.ago.to_fs(:db) %>
   finished_at: ~
   repository: active/foo
   script: hash
@@ -715,8 +715,8 @@ running_job_1_with_circular_component_relationship:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 12.hour.ago.to_s(:db) %>
-  started_at: <%= 12.hour.ago.to_s(:db) %>
+  created_at: <%= 12.hour.ago.to_fs(:db) %>
+  started_at: <%= 12.hour.ago.to_fs(:db) %>
   finished_at: ~
   repository: active/foo
   script: hash
@@ -744,8 +744,8 @@ running_job_2_with_circular_component_relationship:
   cancelled_at: ~
   cancelled_by_user_uuid: ~
   cancelled_by_client_uuid: ~
-  created_at: <%= 12.hour.ago.to_s(:db) %>
-  started_at: <%= 12.hour.ago.to_s(:db) %>
+  created_at: <%= 12.hour.ago.to_fs(:db) %>
+  started_at: <%= 12.hour.ago.to_fs(:db) %>
   finished_at: ~
   repository: active/foo
   script: hash

diff --git a/services/api/test/fixtures/keep_disks.yml b/services/api/test/fixtures/keep_disks.yml
index e8424b26fa2487aff7ac9384304a581aaca7ac9f..5cccf498afa4b3b61ff55acbcb934868afc8150f 100644 (file)
--- a/services/api/test/fixtures/keep_disks.yml
+++ b/services/api/test/fixtures/keep_disks.yml
@@ -7,9 +7,9 @@ nonfull:
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
   node_uuid: zzzzz-7ekkf-53y36l1lu5ijveb
   keep_service_uuid: zzzzz-bi6l4-6zhilxar6r8ey90
-  last_read_at: <%= 1.minute.ago.to_s(:db) %>
-  last_write_at: <%= 2.minute.ago.to_s(:db) %>
-  last_ping_at: <%= 3.minute.ago.to_s(:db) %>
+  last_read_at: <%= 1.minute.ago.to_fs(:db) %>
+  last_write_at: <%= 2.minute.ago.to_fs(:db) %>
+  last_ping_at: <%= 3.minute.ago.to_fs(:db) %>
   ping_secret: z9xz2tc69dho51g1dmkdy5fnupdhsprahcwxdbjs0zms4eo6i
 
 full:
@@ -17,9 +17,9 @@ full:
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
   node_uuid: zzzzz-7ekkf-53y36l1lu5ijveb
   keep_service_uuid: zzzzz-bi6l4-6zhilxar6r8ey90
-  last_read_at: <%= 1.minute.ago.to_s(:db) %>
-  last_write_at: <%= 2.day.ago.to_s(:db) %>
-  last_ping_at: <%= 3.minute.ago.to_s(:db) %>
+  last_read_at: <%= 1.minute.ago.to_fs(:db) %>
+  last_write_at: <%= 2.day.ago.to_fs(:db) %>
+  last_ping_at: <%= 3.minute.ago.to_fs(:db) %>
   ping_secret: xx3ieejcufbjy4lli6yt5ig4e8w5l2hhgmbyzpzuq38gri6lj
 
 nonfull2:
@@ -27,7 +27,7 @@ nonfull2:
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
   node_uuid: zzzzz-7ekkf-2z3mc76g2q73aio
   keep_service_uuid: zzzzz-bi6l4-rsnj3c76ndxb7o0
-  last_read_at: <%= 1.minute.ago.to_s(:db) %>
-  last_write_at: <%= 2.minute.ago.to_s(:db) %>
-  last_ping_at: <%= 3.minute.ago.to_s(:db) %>
+  last_read_at: <%= 1.minute.ago.to_fs(:db) %>
+  last_write_at: <%= 2.minute.ago.to_fs(:db) %>
+  last_ping_at: <%= 3.minute.ago.to_fs(:db) %>
   ping_secret: 4rs260ibhdum1d242xy23qv320rlerc0j7qg9vyqnchbgmjeek

diff --git a/services/api/test/fixtures/logs.yml b/services/api/test/fixtures/logs.yml
index 25f1efff62c8f71246749a3b3c189d297eb7ed82..3b41550ae784802948e33c82b2ced53930718a6f 100644 (file)
--- a/services/api/test/fixtures/logs.yml
+++ b/services/api/test/fixtures/logs.yml
@@ -8,8 +8,8 @@ noop: # nothing happened ...to the 'spectator' user
   owner_uuid: zzzzz-tpzed-000000000000000
   object_uuid: zzzzz-tpzed-l1s2piq4t4mps8r
   object_owner_uuid: zzzzz-tpzed-000000000000000
-  event_at: <%= 1.minute.ago.to_s(:db) %>
-  created_at: <%= 1.minute.ago.to_s(:db) %>
+  event_at: <%= 1.minute.ago.to_fs(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
 
 admin_changes_repository2: # admin changes repository2, which is owned by active user
   id: 2
@@ -17,8 +17,8 @@ admin_changes_repository2: # admin changes repository2, which is owned by active
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f # admin user
   object_uuid: zzzzz-2x53u-382brsig8rp3667 # repository foo
   object_owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz # active user
-  created_at: <%= 2.minute.ago.to_s(:db) %>
-  event_at: <%= 2.minute.ago.to_s(:db) %>
+  created_at: <%= 2.minute.ago.to_fs(:db) %>
+  event_at: <%= 2.minute.ago.to_fs(:db) %>
   event_type: update
 
 admin_changes_specimen: # admin changes specimen owned_by_spectator
@@ -27,8 +27,8 @@ admin_changes_specimen: # admin changes specimen owned_by_spectator
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f # admin user
   object_uuid: zzzzz-2x53u-3b0xxwzlbzxq5yr # specimen owned_by_spectator
   object_owner_uuid: zzzzz-tpzed-l1s2piq4t4mps8r # spectator user
-  created_at: <%= 3.minute.ago.to_s(:db) %>
-  event_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 3.minute.ago.to_fs(:db) %>
+  event_at: <%= 3.minute.ago.to_fs(:db) %>
   event_type: update
 
 system_adds_foo_file: # foo collection added, readable by active through link
@@ -37,8 +37,8 @@ system_adds_foo_file: # foo collection added, readable by active through link
   owner_uuid: zzzzz-tpzed-000000000000000 # system user
   object_uuid: zzzzz-4zz18-znfnqtbbv4spc3w # foo file
   object_owner_uuid: zzzzz-tpzed-000000000000000 # system user
-  created_at: <%= 4.minute.ago.to_s(:db) %>
-  event_at: <%= 4.minute.ago.to_s(:db) %>
+  created_at: <%= 4.minute.ago.to_fs(:db) %>
+  event_at: <%= 4.minute.ago.to_fs(:db) %>
   event_type: create
 
 system_adds_baz: # baz collection added, readable by active and spectator through group 'all users' group membership
@@ -47,8 +47,8 @@ system_adds_baz: # baz collection added, readable by active and spectator throug
   owner_uuid: zzzzz-tpzed-000000000000000 # system user
   object_uuid: zzzzz-4zz18-y9vne9npefyxh8g # baz file
   object_owner_uuid: zzzzz-tpzed-000000000000000 # system user
-  created_at: <%= 5.minute.ago.to_s(:db) %>
-  event_at: <%= 5.minute.ago.to_s(:db) %>
+  created_at: <%= 5.minute.ago.to_fs(:db) %>
+  event_at: <%= 5.minute.ago.to_fs(:db) %>
   event_type: create
 
 log_owned_by_active:
@@ -57,7 +57,7 @@ log_owned_by_active:
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz # active user
   object_uuid: zzzzz-2x53u-382brsig8rp3667 # repository foo
   object_owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz # active user
-  event_at: <%= 2.minute.ago.to_s(:db) %>
+  event_at: <%= 2.minute.ago.to_fs(:db) %>
   summary: non-admin use can read own logs
 
 crunchstat_for_running_job:
@@ -162,16 +162,16 @@ stderr_for_ancient_container:
   modified_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   object_uuid: zzzzz-dz642-logscontainer01
-  event_at: <%= 2.year.ago.to_s(:db) %>
+  event_at: <%= 2.year.ago.to_fs(:db) %>
   event_type: stderr
   summary: ~
   properties:
     text: '2013-11-07_23:33:41 zzzzz-8i9sb-ahd7cie8jah9qui 29610 1 stderr crunchstat:
       cpu 1935.4300 user 59.4100 sys 8 cpus -- interval 10.0002 seconds 12.9900 user
       0.9900 sys'
-  created_at: <%= 2.year.ago.to_s(:db) %>
-  updated_at: <%= 2.year.ago.to_s(:db) %>
-  modified_at: <%= 2.year.ago.to_s(:db) %>
+  created_at: <%= 2.year.ago.to_fs(:db) %>
+  updated_at: <%= 2.year.ago.to_fs(:db) %>
+  modified_at: <%= 2.year.ago.to_fs(:db) %>
   object_owner_uuid: zzzzz-j7d0g-xurymjxw79nv3jz
 
 crunchstat_for_ancient_container:
@@ -181,16 +181,16 @@ crunchstat_for_ancient_container:
   modified_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   object_uuid: zzzzz-dz642-logscontainer01
-  event_at: <%= 2.year.ago.to_s(:db) %>
+  event_at: <%= 2.year.ago.to_fs(:db) %>
   event_type: crunchstat
   summary: ~
   properties:
     text: '2013-11-07_23:33:41 zzzzz-8i9sb-ahd7cie8jah9qui 29610 1 stderr crunchstat:
       cpu 1935.4300 user 59.4100 sys 8 cpus -- interval 10.0002 seconds 12.9900 user
       0.9900 sys'
-  created_at: <%= 2.year.ago.to_s(:db) %>
-  updated_at: <%= 2.year.ago.to_s(:db) %>
-  modified_at: <%= 2.year.ago.to_s(:db) %>
+  created_at: <%= 2.year.ago.to_fs(:db) %>
+  updated_at: <%= 2.year.ago.to_fs(:db) %>
+  modified_at: <%= 2.year.ago.to_fs(:db) %>
   object_owner_uuid: zzzzz-j7d0g-xurymjxw79nv3jz
 
 stderr_for_previous_container:
@@ -200,16 +200,16 @@ stderr_for_previous_container:
   modified_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   object_uuid: zzzzz-dz642-logscontainer02
-  event_at: <%= 1.month.ago.to_s(:db) %>
+  event_at: <%= 1.month.ago.to_fs(:db) %>
   event_type: stderr
   summary: ~
   properties:
     text: '2013-11-07_23:33:41 zzzzz-8i9sb-ahd7cie8jah9qui 29610 1 stderr crunchstat:
       cpu 1935.4300 user 59.4100 sys 8 cpus -- interval 10.0002 seconds 12.9900 user
       0.9900 sys'
-  created_at: <%= 1.month.ago.to_s(:db) %>
-  updated_at: <%= 1.month.ago.to_s(:db) %>
-  modified_at: <%= 1.month.ago.to_s(:db) %>
+  created_at: <%= 1.month.ago.to_fs(:db) %>
+  updated_at: <%= 1.month.ago.to_fs(:db) %>
+  modified_at: <%= 1.month.ago.to_fs(:db) %>
   object_owner_uuid: zzzzz-j7d0g-xurymjxw79nv3jz
 
 crunchstat_for_previous_container:
@@ -219,16 +219,16 @@ crunchstat_for_previous_container:
   modified_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   object_uuid: zzzzz-dz642-logscontainer02
-  event_at: <%= 1.month.ago.to_s(:db) %>
+  event_at: <%= 1.month.ago.to_fs(:db) %>
   event_type: crunchstat
   summary: ~
   properties:
     text: '2013-11-07_23:33:41 zzzzz-8i9sb-ahd7cie8jah9qui 29610 1 stderr crunchstat:
       cpu 1935.4300 user 59.4100 sys 8 cpus -- interval 10.0002 seconds 12.9900 user
       0.9900 sys'
-  created_at: <%= 1.month.ago.to_s(:db) %>
-  updated_at: <%= 1.month.ago.to_s(:db) %>
-  modified_at: <%= 1.month.ago.to_s(:db) %>
+  created_at: <%= 1.month.ago.to_fs(:db) %>
+  updated_at: <%= 1.month.ago.to_fs(:db) %>
+  modified_at: <%= 1.month.ago.to_fs(:db) %>
   object_owner_uuid: zzzzz-j7d0g-xurymjxw79nv3jz
 
 stderr_for_running_container:
@@ -238,16 +238,16 @@ stderr_for_running_container:
   modified_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   object_uuid: zzzzz-dz642-logscontainer03
-  event_at: <%= 1.hour.ago.to_s(:db) %>
+  event_at: <%= 1.hour.ago.to_fs(:db) %>
   event_type: crunchstat
   summary: ~
   properties:
     text: '2013-11-07_23:33:41 zzzzz-8i9sb-ahd7cie8jah9qui 29610 1 stderr crunchstat:
       cpu 1935.4300 user 59.4100 sys 8 cpus -- interval 10.0002 seconds 12.9900 user
       0.9900 sys'
-  created_at: <%= 1.hour.ago.to_s(:db) %>
-  updated_at: <%= 1.hour.ago.to_s(:db) %>
-  modified_at: <%= 1.hour.ago.to_s(:db) %>
+  created_at: <%= 1.hour.ago.to_fs(:db) %>
+  updated_at: <%= 1.hour.ago.to_fs(:db) %>
+  modified_at: <%= 1.hour.ago.to_fs(:db) %>
   object_owner_uuid: zzzzz-j7d0g-xurymjxw79nv3jz
 
 crunchstat_for_running_container:
@@ -257,14 +257,14 @@ crunchstat_for_running_container:
   modified_by_client_uuid: zzzzz-ozdt8-obw7foaks3qjyej
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   object_uuid: zzzzz-dz642-logscontainer03
-  event_at: <%= 1.hour.ago.to_s(:db) %>
+  event_at: <%= 1.hour.ago.to_fs(:db) %>
   event_type: crunchstat
   summary: ~
   properties:
     text: '2013-11-07_23:33:41 zzzzz-8i9sb-ahd7cie8jah9qui 29610 1 stderr crunchstat:
       cpu 1935.4300 user 59.4100 sys 8 cpus -- interval 10.0002 seconds 12.9900 user
       0.9900 sys'
-  created_at: <%= 1.hour.ago.to_s(:db) %>
-  updated_at: <%= 1.hour.ago.to_s(:db) %>
-  modified_at: <%= 1.hour.ago.to_s(:db) %>
+  created_at: <%= 1.hour.ago.to_fs(:db) %>
+  updated_at: <%= 1.hour.ago.to_fs(:db) %>
+  modified_at: <%= 1.hour.ago.to_fs(:db) %>
   object_owner_uuid: zzzzz-j7d0g-xurymjxw79nv3jz

diff --git a/services/api/test/fixtures/nodes.yml b/services/api/test/fixtures/nodes.yml
index 821a6b5e4221d50edfc5b8de871e7ee31657a070..d4589ed705b9fa51c11c6e65212a02e0b5d4a92f 100644 (file)
--- a/services/api/test/fixtures/nodes.yml
+++ b/services/api/test/fixtures/nodes.yml
@@ -9,8 +9,8 @@ busy:
   slot_number: 0
   domain: ""
   ip_address: 172.17.2.172
-  last_ping_at: <%= 1.minute.ago.to_s(:db) %>
-  first_ping_at: <%= 23.hour.ago.to_s(:db) %>
+  last_ping_at: <%= 1.minute.ago.to_fs(:db) %>
+  first_ping_at: <%= 23.hour.ago.to_fs(:db) %>
   job_uuid: zzzzz-8i9sb-2gx6rz0pjl033w3  # nearly_finished_job
   properties: {}
   info:
@@ -24,8 +24,8 @@ down:
   slot_number: 1
   domain: ""
   ip_address: 172.17.2.173
-  last_ping_at: <%= 1.hour.ago.to_s(:db) %>
-  first_ping_at: <%= 23.hour.ago.to_s(:db) %>
+  last_ping_at: <%= 1.hour.ago.to_fs(:db) %>
+  first_ping_at: <%= 23.hour.ago.to_fs(:db) %>
   job_uuid: ~
   properties: {}
   info:
@@ -38,8 +38,8 @@ idle:
   slot_number: 2
   domain: ""
   ip_address: 172.17.2.174
-  last_ping_at: <%= 2.minute.ago.to_s(:db) %>
-  first_ping_at: <%= 23.hour.ago.to_s(:db) %>
+  last_ping_at: <%= 2.minute.ago.to_fs(:db) %>
+  first_ping_at: <%= 23.hour.ago.to_fs(:db) %>
   job_uuid: ~
   info:
     ping_secret: "69udawxvn3zzj45hs8bumvndricrha4lcpi23pd69e44soanc0"
@@ -54,8 +54,8 @@ was_idle_now_down:
   slot_number: ~
   domain: ""
   ip_address: 172.17.2.174
-  last_ping_at: <%= 1.hour.ago.to_s(:db) %>
-  first_ping_at: <%= 23.hour.ago.to_s(:db) %>
+  last_ping_at: <%= 1.hour.ago.to_fs(:db) %>
+  first_ping_at: <%= 23.hour.ago.to_fs(:db) %>
   job_uuid: ~
   info:
     ping_secret: "1bd1yi0x4lb5q4gzqqtrnq30oyj08r8dtdimmanbqw49z1anz2"

diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index a504c9fadd790cb21e2410cb95cefd082c32cfbf..714fc60771692cee93f9e4c654a22cb3e6de7ea9 100644 (file)
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -6,19 +6,19 @@ new_pipeline:
   state: New
   uuid: zzzzz-d1hrv-f4gneyn6br1xize
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
 
 new_pipeline_in_subproject:
   state: New
   uuid: zzzzz-d1hrv-subprojpipeline
   owner_uuid: zzzzz-j7d0g-axqo7eu9pwvna1x
-  created_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
 
 has_component_with_no_script_parameters:
   state: Ready
   uuid: zzzzz-d1hrv-1xfj6xkicf2muk2
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 10.minute.ago.to_s(:db) %>
+  created_at: <%= 10.minute.ago.to_fs(:db) %>
   components:
    foo:
     script: foo
@@ -29,7 +29,7 @@ has_component_with_empty_script_parameters:
   state: Ready
   uuid: zzzzz-d1hrv-jq16l10gcsnyumo
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 3.minute.ago.to_s(:db) %>
+  created_at: <%= 3.minute.ago.to_fs(:db) %>
   components:
    foo:
     script: foo
@@ -46,9 +46,9 @@ has_component_with_completed_jobs:
   state: Complete
   uuid: zzzzz-d1hrv-i3e77t9z5y8j9cc
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 11.minute.ago.to_s(:db) %>
-  started_at: <%= 10.minute.ago.to_s(:db) %>
-  finished_at: <%= 9.minute.ago.to_s(:db) %>
+  created_at: <%= 11.minute.ago.to_fs(:db) %>
+  started_at: <%= 10.minute.ago.to_fs(:db) %>
+  finished_at: <%= 9.minute.ago.to_fs(:db) %>
   components:
    foo:
     script: foo
@@ -57,9 +57,9 @@ has_component_with_completed_jobs:
     job:
       uuid: zzzzz-8i9sb-rft1xdewxkwgxnz
       script_version: main
-      created_at: <%= 10.minute.ago.to_s(:db) %>
-      started_at: <%= 10.minute.ago.to_s(:db) %>
-      finished_at: <%= 9.minute.ago.to_s(:db) %>
+      created_at: <%= 10.minute.ago.to_fs(:db) %>
+      started_at: <%= 10.minute.ago.to_fs(:db) %>
+      finished_at: <%= 9.minute.ago.to_fs(:db) %>
       state: Complete
       tasks_summary:
         failed: 0
@@ -73,8 +73,8 @@ has_component_with_completed_jobs:
     job:
       uuid: zzzzz-8i9sb-r2dtbzr6bfread7
       script_version: main
-      created_at: <%= 9.minute.ago.to_s(:db) %>
-      started_at: <%= 9.minute.ago.to_s(:db) %>
+      created_at: <%= 9.minute.ago.to_fs(:db) %>
+      started_at: <%= 9.minute.ago.to_fs(:db) %>
       state: Running
       tasks_summary:
         failed: 0
@@ -88,7 +88,7 @@ has_component_with_completed_jobs:
     job:
       uuid: zzzzz-8i9sb-c7408rni11o7r6s
       script_version: main
-      created_at: <%= 9.minute.ago.to_s(:db) %>
+      created_at: <%= 9.minute.ago.to_fs(:db) %>
       state: Queued
       tasks_summary: {}
 
@@ -97,7 +97,7 @@ has_job:
   state: Ready
   uuid: zzzzz-d1hrv-1yfj6xkidf2muk3
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 2.9.minute.ago.to_s(:db) %>
+  created_at: <%= 2.9.minute.ago.to_fs(:db) %>
   components:
    foo:
     script: foo
@@ -112,7 +112,7 @@ components_is_jobspec:
   # Helps test that clients cope with funny-shaped components.
   # For an example, see #3321.
   uuid: zzzzz-d1hrv-1yfj61234abcdk4
-  created_at: <%= 4.minute.ago.to_s(:db) %>
+  created_at: <%= 4.minute.ago.to_fs(:db) %>
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
@@ -132,7 +132,7 @@ pipeline_with_tagged_collection_input:
   state: Ready
   uuid: zzzzz-d1hrv-1yfj61234abcdk3
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 3.2.minute.ago.to_s(:db) %>
+  created_at: <%= 3.2.minute.ago.to_fs(:db) %>
   components:
     part-one:
       script_parameters:
@@ -145,7 +145,7 @@ pipeline_to_merge_params:
   uuid: zzzzz-d1hrv-1yfj6dcba4321k3
   pipeline_template_uuid: zzzzz-p5p6p-aox0k0ofxrystgw
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 3.3.minute.ago.to_s(:db) %>
+  created_at: <%= 3.3.minute.ago.to_fs(:db) %>
   components:
     part-one:
       script_parameters:
@@ -260,7 +260,7 @@ pipeline_in_publicly_accessible_project:
   name: Pipeline in publicly accessible project
   pipeline_template_uuid: zzzzz-p5p6p-tmpltpublicproj
   state: Complete
-  created_at: <%= 30.minute.ago.to_s(:db) %>
+  created_at: <%= 30.minute.ago.to_fs(:db) %>
   components:
     foo:
       script: foo
@@ -363,8 +363,8 @@ pipeline_in_running_state:
   name: running_with_job
   uuid: zzzzz-d1hrv-runningpipeline
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 2.8.minute.ago.to_s(:db) %>
-  started_at: <%= 2.8.minute.ago.to_s(:db) %>
+  created_at: <%= 2.8.minute.ago.to_fs(:db) %>
+  started_at: <%= 2.8.minute.ago.to_fs(:db) %>
   state: RunningOnServer
   components:
    foo:
@@ -379,7 +379,7 @@ running_pipeline_with_complete_job:
   uuid: zzzzz-d1hrv-partdonepipelin
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   state: RunningOnServer
-  created_at: <%= 15.minute.ago.to_s(:db) %>
+  created_at: <%= 15.minute.ago.to_fs(:db) %>
   components:
    previous:
     job:
@@ -393,9 +393,9 @@ complete_pipeline_with_two_jobs:
   uuid: zzzzz-d1hrv-twodonepipeline
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   state: Complete
-  created_at: <%= 2.5.minute.ago.to_s(:db) %>
-  started_at: <%= 2.minute.ago.to_s(:db) %>
-  finished_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 2.5.minute.ago.to_fs(:db) %>
+  started_at: <%= 2.minute.ago.to_fs(:db) %>
+  finished_at: <%= 1.minute.ago.to_fs(:db) %>
   components:
    ancient:
     job:
@@ -409,7 +409,7 @@ complete_pipeline_with_two_jobs:
 failed_pipeline_with_two_jobs:
   uuid: zzzzz-d1hrv-twofailpipeline
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 55.minute.ago.to_s(:db) %>
+  created_at: <%= 55.minute.ago.to_fs(:db) %>
   state: Failed
   components:
    ancient:
@@ -426,8 +426,8 @@ job_child_pipeline_with_components_at_level_2:
   state: RunningOnServer
   uuid: zzzzz-d1hrv-picomponentsl02
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 12.hour.ago.to_s(:db) %>
-  started_at: <%= 12.hour.ago.to_s(:db) %>
+  created_at: <%= 12.hour.ago.to_fs(:db) %>
+  started_at: <%= 12.hour.ago.to_fs(:db) %>
   components:
    foo:
     script: foo
@@ -436,8 +436,8 @@ job_child_pipeline_with_components_at_level_2:
     job:
       uuid: zzzzz-8i9sb-job1atlevel3noc
       script_version: main
-      created_at: <%= 12.hour.ago.to_s(:db) %>
-      started_at: <%= 12.hour.ago.to_s(:db) %>
+      created_at: <%= 12.hour.ago.to_fs(:db) %>
+      started_at: <%= 12.hour.ago.to_fs(:db) %>
       state: Running
       tasks_summary:
         failed: 0
@@ -451,8 +451,8 @@ job_child_pipeline_with_components_at_level_2:
     job:
       uuid: zzzzz-8i9sb-job2atlevel3noc
       script_version: main
-      created_at: <%= 12.hour.ago.to_s(:db) %>
-      started_at: <%= 12.hour.ago.to_s(:db) %>
+      created_at: <%= 12.hour.ago.to_fs(:db) %>
+      started_at: <%= 12.hour.ago.to_fs(:db) %>
       state: Running
       tasks_summary:
         failed: 0
@@ -470,9 +470,9 @@ pipeline_<%=i%>_of_10:
   name: pipeline_<%= i %>
   uuid: zzzzz-d1hrv-10pipelines0<%= i.to_s.rjust(3, '0') %>
   owner_uuid: zzzzz-j7d0g-000010pipelines
-  created_at: <%= (2*(i-1)).hour.ago.to_s(:db) %>
-  started_at: <%= (2*(i-1)).hour.ago.to_s(:db) %>
-  finished_at: <%= (i-1).minute.ago.to_s(:db) %>
+  created_at: <%= (2*(i-1)).hour.ago.to_fs(:db) %>
+  started_at: <%= (2*(i-1)).hour.ago.to_fs(:db) %>
+  finished_at: <%= (i-1).minute.ago.to_fs(:db) %>
   state: Failed
   components:
     foo:
@@ -494,7 +494,7 @@ pipeline_<%=i%>_of_2_pipelines_and_60_crs:
   state: New
   uuid: zzzzz-d1hrv-abcgneyn6brx<%= i.to_s.rjust(3, '0') %>
   owner_uuid: zzzzz-j7d0g-nnncrspipelines
-  created_at: <%= i.minute.ago.to_s(:db) %>
+  created_at: <%= i.minute.ago.to_fs(:db) %>
   components:
     foo:
       script: foo
@@ -513,9 +513,9 @@ pipeline_<%=i%>_of_25:
   state: Failed
   uuid: zzzzz-d1hrv-25pipelines0<%= i.to_s.rjust(3, '0') %>
   owner_uuid: zzzzz-j7d0g-000025pipelines
-  created_at: <%= i.hour.ago.to_s(:db) %>
-  started_at: <%= i.hour.ago.to_s(:db) %>
-  finished_at: <%= i.minute.ago.to_s(:db) %>
+  created_at: <%= i.hour.ago.to_fs(:db) %>
+  started_at: <%= i.hour.ago.to_fs(:db) %>
+  finished_at: <%= i.minute.ago.to_fs(:db) %>
   components:
     foo:
       script: foo

diff --git a/services/api/test/fixtures/workflows.yml b/services/api/test/fixtures/workflows.yml
index 29b76abb456a7012325a7d79f14e25116cb6fc8f..ad9c7d267683668559aed7a355983d00d72b3fc1 100644 (file)
--- a/services/api/test/fixtures/workflows.yml
+++ b/services/api/test/fixtures/workflows.yml
@@ -28,7 +28,7 @@ workflow_with_input_specifications:
   owner_uuid: zzzzz-j7d0g-zhxawtyetzwc5f0
   name: Workflow with input specifications
   description: this workflow has inputs specified
-  created_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
   definition: |
     cwlVersion: v1.0
     class: CommandLineTool
@@ -54,7 +54,7 @@ workflow_with_input_defaults:
   owner_uuid: zzzzz-j7d0g-zhxawtyetzwc5f0
   name: Workflow with default input specifications
   description: this workflow has inputs specified
-  created_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
   definition: |
     cwlVersion: v1.0
     class: CommandLineTool
@@ -73,7 +73,7 @@ workflow_with_wrr:
   owner_uuid: zzzzz-j7d0g-zhxawtyetzwc5f0
   name: Workflow with WorkflowRunnerResources
   description: this workflow has WorkflowRunnerResources
-  created_at: <%= 1.minute.ago.to_s(:db) %>
+  created_at: <%= 1.minute.ago.to_fs(:db) %>
   definition: |
     cwlVersion: v1.0
     class: CommandLineTool