Commit 60a6a643 authored by Stan Hu's avatar Stan Hu

Fix specs for enabling jemalloc by default

parent 991961c1
......@@ -163,7 +163,7 @@ describe 'gitlab::gitlab-rails' do
it_behaves_like "enabled gitlab-rails env", "ICU_DATA", '\/opt\/gitlab\/embedded\/share\/icu\/current'
it_behaves_like "enabled gitlab-rails env", "PYTHONPATH", '\/opt\/gitlab\/embedded\/lib\/python3.4\/site-packages'
it_behaves_like "disabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
it_behaves_like "enabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
context 'when a custom env variable is specified' do
before do
......@@ -173,16 +173,16 @@ describe 'gitlab::gitlab-rails' do
it_behaves_like "enabled gitlab-rails env", "IAM", 'CUSTOMVAR'
it_behaves_like "enabled gitlab-rails env", "ICU_DATA", '\/opt\/gitlab\/embedded\/share\/icu\/current'
it_behaves_like "disabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
it_behaves_like "enabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
end
end
context 'when jemalloc is enabled' do
context 'when jemalloc is disabled' do
before do
stub_gitlab_rb(gitlab_rails: { enable_jemalloc: true })
stub_gitlab_rb(gitlab_rails: { enable_jemalloc: false })
end
it_behaves_like "enabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
it_behaves_like "disabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment