diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb')
-rw-r--r-- | spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb index b8ac8c5b95c..864529a6bf6 100644 --- a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb +++ b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb @@ -5,7 +5,9 @@ require 'spec_helper' # For easier debugging set `PUMA_DEBUG=1` describe Gitlab::Cluster::Mixins::PumaCluster do - PUMA_STARTUP_TIMEOUT = 30 + before do + stub_const('PUMA_STARTUP_TIMEOUT', 30) + end context 'when running Puma in Cluster-mode' do using RSpec::Parameterized::TableSyntax |