From 56c129293578cb620daf1c19b1bc61cd18d9fa83 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Mon, 8 Jul 2019 09:36:22 +1200 Subject: [PATCH] Add retry:0 for controller specs n+1 As a workaround for https://gitlab.com/gitlab-org/gitlab-ce/issues/64116 --- spec/controllers/projects/merge_requests_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 2a6736018ea..9878f88a395 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -878,7 +878,7 @@ describe Projects::MergeRequestsController do expect(control_count).to be <= 137 end - it 'has no N+1 issues for environments', :request_store do + it 'has no N+1 issues for environments', :request_store, retry: 0 do # First run to insert test data from lets, which does take up some 30 queries get_ci_environments_status