diff options
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/helpers/kubernetes_helpers.rb | 4 | ||||
| -rw-r--r-- | spec/support/redis/redis_shared_examples.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/support/helpers/kubernetes_helpers.rb b/spec/support/helpers/kubernetes_helpers.rb index cac43e94a92..a3b527e0ffe 100644 --- a/spec/support/helpers/kubernetes_helpers.rb +++ b/spec/support/helpers/kubernetes_helpers.rb @@ -84,7 +84,7 @@ module KubernetesHelpers end logs_url = service.api_url + "/api/v1/namespaces/#{namespace}/pods/#{pod_name}" \ - "/log?#{container_query_param}tailLines=#{Clusters::Platforms::Kubernetes::LOGS_LIMIT}" + "/log?#{container_query_param}tailLines=#{Clusters::Platforms::Kubernetes::LOGS_LIMIT}×tamps=true" if status response = { status: status } @@ -331,7 +331,7 @@ module KubernetesHelpers end def kube_logs_body - "Log 1\nLog 2\nLog 3" + "2019-12-13T14:04:22.123456Z Log 1\n2019-12-13T14:04:23.123456Z Log 2\n2019-12-13T14:04:24.123456Z Log 3" end def kube_deployments_body diff --git a/spec/support/redis/redis_shared_examples.rb b/spec/support/redis/redis_shared_examples.rb index e079c32d6ae..97a23f02b3e 100644 --- a/spec/support/redis/redis_shared_examples.rb +++ b/spec/support/redis/redis_shared_examples.rb @@ -118,7 +118,7 @@ RSpec.shared_examples "redis_shared_examples" do context 'when running not on sidekiq workers' do before do - allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(false) + allow(Sidekiq).to receive(:server?).and_return(false) end it 'instantiates a connection pool with size 5' do @@ -130,7 +130,7 @@ RSpec.shared_examples "redis_shared_examples" do context 'when running on sidekiq workers' do before do - allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true) + allow(Sidekiq).to receive(:server?).and_return(true) allow(Sidekiq).to receive(:options).and_return({ concurrency: 18 }) end |