diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-25 16:31:53 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-25 16:46:20 +1200 |
| commit | 41f87e9e99e14f7d591f222b0246467acd040625 (patch) | |
| tree | 3c890316bb7a0f8755831ecfb8d94d2282c900ef /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 7fa0c7662b88efa72d29087a273f0b6c1e484b3e (diff) | |
| download | gitlab-ce-41f87e9e99e14f7d591f222b0246467acd040625.tar.gz | |
Removes potentially incorrect, and slow fallbackremove_deployment_metrics_deployment_platform_fallback
Deployment_platform is relatively expensive and calling this after the
fact means that this may not be the cluster that was deployed to.
Correspondingly reduce the leeway given in the related N+1 spec
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index f11880122b1..fa71d9b61b1 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -885,10 +885,9 @@ describe Projects::MergeRequestsController do environment2 = create(:environment, project: forked) create(:deployment, :succeed, environment: environment2, sha: sha, ref: 'master', deployable: build) - # TODO address the last 11 queries + # TODO address the last 5 queries # See https://gitlab.com/gitlab-org/gitlab-ce/issues/63952 (5 queries) - # And https://gitlab.com/gitlab-org/gitlab-ce/issues/64105 (6 queries) - leeway = 11 + leeway = 5 expect { get_ci_environments_status }.not_to exceed_all_query_limit(control_count + leeway) end end |