diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /spec/support/memory_instrumentation_helper.rb | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'spec/support/memory_instrumentation_helper.rb')
| -rw-r--r-- | spec/support/memory_instrumentation_helper.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/spec/support/memory_instrumentation_helper.rb b/spec/support/memory_instrumentation_helper.rb index 84ec02fa5aa..51506376a75 100644 --- a/spec/support/memory_instrumentation_helper.rb +++ b/spec/support/memory_instrumentation_helper.rb @@ -5,13 +5,10 @@ # This concept is currently tried to be upstreamed here: # - https://github.com/ruby/ruby/pull/3978 module MemoryInstrumentationHelper - def skip_memory_instrumentation! + def verify_memory_instrumentation_available! return if ::Gitlab::Memory::Instrumentation.available? - # if we are running in CI, a test cannot be skipped - return if ENV['CI'] - - skip 'Missing a memory instrumentation patch. ' \ + raise 'Ruby is missing a required patch that enables memory instrumentation. ' \ 'More information can be found here: https://gitlab.com/gitlab-org/gitlab/-/issues/296530.' end end |