diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/support/helpers/memory_usage_helper.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/support/helpers/memory_usage_helper.rb')
-rw-r--r-- | spec/support/helpers/memory_usage_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/helpers/memory_usage_helper.rb b/spec/support/helpers/memory_usage_helper.rb index 984ea8cc571..aa7b3bae83a 100644 --- a/spec/support/helpers/memory_usage_helper.rb +++ b/spec/support/helpers/memory_usage_helper.rb @@ -21,7 +21,7 @@ module MemoryUsageHelper def get_memory_usage output, status = Gitlab::Popen.popen(%w(free -m)) - abort "`free -m` return code is #{status}: #{output}" unless status.zero? + abort "`free -m` return code is #{status}: #{output}" unless status == 0 result = output.split("\n")[1].split(" ")[1..-1] attrs = %i(m_total m_used m_free m_shared m_buffers_cache m_available).freeze |