summaryrefslogtreecommitdiff
path: root/tests/helpers/os_helper.rb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-11-06 00:16:24 +0100
committervarac <varacanero@zeromail.org>2015-11-17 19:51:11 +0100
commit675f826d4a85c1cd26e30d0f8ef52d5b592c0d1c (patch)
tree0f6c7b915d5b4734ac5b352507664a3447d2fe83 /tests/helpers/os_helper.rb
parente433b14fa14837f9889e08cb662bf29498179237 (diff)
[bug] [jessie] check for 1 stunnel instance only
- Resolves: #7574
Diffstat (limited to 'tests/helpers/os_helper.rb')
-rw-r--r--tests/helpers/os_helper.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/helpers/os_helper.rb b/tests/helpers/os_helper.rb
index aad67dda..c57300e2 100644
--- a/tests/helpers/os_helper.rb
+++ b/tests/helpers/os_helper.rb
@@ -9,7 +9,10 @@ class LeapTest
output.each_line.map{|line|
pid = line.split(' ')[0]
process = line.gsub(/(#{pid} |\n)/, '')
- if process =~ /pgrep --full --list-name/
+ # filter out pgrep cmd itself
+ # on wheezy hosts, the "process" var contains the whole cmd including all parameters
+ # on jessie hosts, it only contains the first cmd (which is the default sheel invoked by 'sh')
+ if process =~ /^sh/
nil
else
{:pid => pid, :process => process}
@@ -35,4 +38,4 @@ class LeapTest
end
end
-end \ No newline at end of file
+end