Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/lib/gitlab/gpg_spec.rb b/spec/lib/gitlab/gpg_spec.rb
index 27a3010eeed..fac2dbfab71 100644
--- a/spec/lib/gitlab/gpg_spec.rb
+++ b/spec/lib/gitlab/gpg_spec.rb
@@ -208,8 +208,8 @@ describe Gitlab::Gpg do
         allow(FileUtils).to receive(:remove_entry).with(any_args).and_call_original
       end
 
-      it "tries for #{seconds}" do
-        expect(Retriable).to receive(:retriable).with(a_hash_including(max_elapsed_time: seconds))
+      it "tries for #{seconds} or 15 times" do
+        expect(Retriable).to receive(:retriable).with(a_hash_including(max_elapsed_time: seconds, tries: 15))
 
         described_class.using_tmp_keychain {}
       end