Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/lib/gitlab/memory/instrumentation_spec.rb b/spec/lib/gitlab/memory/instrumentation_spec.rb
index 6b53550a3d0..0dbe9a8e275 100644
--- a/spec/lib/gitlab/memory/instrumentation_spec.rb
+++ b/spec/lib/gitlab/memory/instrumentation_spec.rb
@@ -69,10 +69,12 @@ RSpec.describe Gitlab::Memory::Instrumentation do
       end
 
       it 'a hash is returned' do
-        is_expected.to include(
+        result = subject
+        expect(result).to include(
           mem_objects: be > 1000,
           mem_mallocs: be > 1000,
-          mem_bytes: be > 100_000 # 100 items * 100 bytes each
+          mem_bytes: be > 100_000, # 100 items * 100 bytes each
+          mem_total_bytes: eq(result[:mem_bytes] + 40 * result[:mem_objects])
         )
       end
     end