X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fbd0963c235b6f7d488c5748c772af8c5f636280..6c2c6780ec231d5a080878a8c1b7b106c5629483:/apps/workbench/test/integration/websockets_test.rb diff --git a/apps/workbench/test/integration/websockets_test.rb b/apps/workbench/test/integration/websockets_test.rb index a2300b7b63..655ad92c94 100644 --- a/apps/workbench/test/integration/websockets_test.rb +++ b/apps/workbench/test/integration/websockets_test.rb @@ -212,14 +212,14 @@ class WebsocketTest < ActionDispatch::IntegrationTest assert_in_epsilon value, datum.to_f end - test "test running job with just a few previous log lines" do + test "test running job with just a few previous log records" do Thread.current[:arvados_api_token] = @@API_AUTHS["admin"]['api_token'] job = Job.where(uuid: api_fixture("jobs")['running']['uuid']).results.first visit page_with_token("admin", "/jobs/#{job.uuid}") api = ArvadosApiClient.new - # Create just one old log line + # Create just one old log record api.api("logs", "", {log: { object_uuid: job.uuid, event_type: "stderr", @@ -227,11 +227,11 @@ class WebsocketTest < ActionDispatch::IntegrationTest click_link("Log") - # Expect "all" historic log lines because we have less than - # default Rails.configuration.running_job_log_lines_to_fetch count + # Expect "all" historic log records because we have less than + # default Rails.configuration.running_job_log_records_to_fetch count assert_text 'Historic log message' - # Create new log line and expect it to show up in log tab + # Create new log record and expect it to show up in log tab api.api("logs", "", {log: { object_uuid: job.uuid, event_type: "stderr", @@ -239,8 +239,8 @@ class WebsocketTest < ActionDispatch::IntegrationTest assert_text 'Log message after subscription' end - test "test running job with too many previous log lines" do - Rails.configuration.running_job_log_lines_to_fetch = 5 + test "test running job with too many previous log records" do + Rails.configuration.running_job_log_records_to_fetch = 5 Thread.current[:arvados_api_token] = @@API_AUTHS["admin"]['api_token'] job = Job.where(uuid: api_fixture("jobs")['running']['uuid']).results.first @@ -249,8 +249,8 @@ class WebsocketTest < ActionDispatch::IntegrationTest api = ArvadosApiClient.new - # Create Rails.configuration.running_job_log_lines_to_fetch + 1 log lines - (0..Rails.configuration.running_job_log_lines_to_fetch).each do |count| + # Create Rails.configuration.running_job_log_records_to_fetch + 1 log records + (0..Rails.configuration.running_job_log_records_to_fetch).each do |count| api.api("logs", "", {log: { object_uuid: job.uuid, event_type: "stderr", @@ -260,14 +260,14 @@ class WebsocketTest < ActionDispatch::IntegrationTest # Go to log tab, which results in subscribing to websockets click_link("Log") - # Expect all but the first historic log lines, + # Expect all but the first historic log records, # because that was one too many than fetch count. - (1..Rails.configuration.running_job_log_lines_to_fetch).each do |count| + (1..Rails.configuration.running_job_log_records_to_fetch).each do |count| assert_text "Old log message #{count}" end assert_no_text 'Old log message 0' - # Create one more log line after subsription + # Create one more log record after subscription api.api("logs", "", {log: { object_uuid: job.uuid, event_type: "stderr",