tests: fix online_brick_count

It turns out that "pidof" is unreliable on some platforms (e.g. Fedora
21) because it will show spurious entries for processes using the same
inode under a different name.  Use "pgrep" instead because it's
name-based and doesn't get confused by glusterd/glusterfs being links
to glusterfsd.

Also changed bug-913555.t because it had the same mistake in its own
version of the same function.  Now it uses the common version.

Change-Id: I5d70edd5655faa5470e0f378b8c16a6adacbd4b4
BUG: 1163543
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/9948
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/volume.rc b/tests/volume.rc
index ac078e2bcce..741d2b81c15 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -16,7 +16,7 @@ function brick_count()
 
 function online_brick_count ()
 {
-    pidof glusterfsd | wc -w
+    pgrep glusterfsd | wc -l
 }
 
 function volume_option()