From 1804227b4fb012858930b66419b026a5bf8b8f7d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 9 Feb 2020 12:08:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/gitlab/kubernetes/kube_client_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec/lib/gitlab/kubernetes') diff --git a/spec/lib/gitlab/kubernetes/kube_client_spec.rb b/spec/lib/gitlab/kubernetes/kube_client_spec.rb index 729c2b04930..1959fbca33b 100644 --- a/spec/lib/gitlab/kubernetes/kube_client_spec.rb +++ b/spec/lib/gitlab/kubernetes/kube_client_spec.rb @@ -92,6 +92,16 @@ describe Gitlab::Kubernetes::KubeClient do it_behaves_like 'local address' end + + it 'falls back to default options, but allows overriding' do + client = Gitlab::Kubernetes::KubeClient.new(api_url, {}) + defaults = Gitlab::Kubernetes::KubeClient::DEFAULT_KUBECLIENT_OPTIONS + expect(client.kubeclient_options[:timeouts]).to eq(defaults[:timeouts]) + + client = Gitlab::Kubernetes::KubeClient.new(api_url, timeouts: { read: 7 }) + expect(client.kubeclient_options[:timeouts][:read]).to eq(7) + expect(client.kubeclient_options[:timeouts][:open]).to eq(defaults[:timeouts][:open]) + end end describe '#core_client' do -- cgit v1.2.3