From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- spec/lib/gitlab/kubernetes/kubectl_cmd_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'spec/lib/gitlab/kubernetes/kubectl_cmd_spec.rb') diff --git a/spec/lib/gitlab/kubernetes/kubectl_cmd_spec.rb b/spec/lib/gitlab/kubernetes/kubectl_cmd_spec.rb index e80bb3dfb07..2e373613269 100644 --- a/spec/lib/gitlab/kubernetes/kubectl_cmd_spec.rb +++ b/spec/lib/gitlab/kubernetes/kubectl_cmd_spec.rb @@ -56,9 +56,10 @@ RSpec.describe Gitlab::Kubernetes::KubectlCmd do describe '.delete_crds_from_group' do it 'constructs string properly' do - expected_command = 'kubectl api-resources -o name --api-group foo | xargs kubectl delete --ignore-not-found crd' + command = 'kubectl api-resources -o name --api-group foo | xargs -r kubectl delete --ignore-not-found crd' + command_with_retries = "for i in $(seq 1 3); do #{command} && s=0 && break || s=$?; sleep 1s; echo \"Retrying ($i)...\"; done; (exit $s)" - expect(described_class.delete_crds_from_group("foo")).to eq expected_command + expect(described_class.delete_crds_from_group("foo")).to eq command_with_retries end end end -- cgit v1.2.1