diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-04 17:26:37 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-08 09:14:37 +1200 |
| commit | c85d6b0c744e9a971fafdf58328f907dfa0de127 (patch) | |
| tree | 5d65b622c5bc40ec0cc0deb66be33edb660383a7 /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 25ba11a2aad9571e4759cdc711199634e3392c5b (diff) | |
| download | gitlab-ce-c85d6b0c744e9a971fafdf58328f907dfa0de127.tar.gz | |
Restore fallback to deployment_platform_cluster
In 12.2 we will remove this fallback.
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index ea160a21955..2a6736018ea 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -887,9 +887,10 @@ describe Projects::MergeRequestsController do environment2 = create(:environment, project: forked) create(:deployment, :succeed, environment: environment2, sha: sha, ref: 'master', deployable: build) - # TODO address the last 5 queries - # See https://gitlab.com/gitlab-org/gitlab-ce/issues/63952 - leeway = 5 + # TODO address the last 11 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 expect { get_ci_environments_status }.not_to exceed_all_query_limit(control_count + leeway) end |