From 4f435d35ddfe1a18ee6d47ace862b1f33691bf28 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Tue, 19 Mar 2013 14:14:05 +0100
Subject: [PATCH] Reduce should-run process arguments + quote heartbeat cmdline

In failing tests it's hard to parse very long cmdlines, so reduce
it as much as possible and still sensible. Also fix quoting of
the heartbeat command line for YAML format.
---
 ce/test-server.yaml  | 14 ++++++--------
 pro/test-server.yaml | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/ce/test-server.yaml b/ce/test-server.yaml
index 5494622..d143c7d 100644
--- a/ce/test-server.yaml
+++ b/ce/test-server.yaml
@@ -7,7 +7,6 @@ running-processes:
     should-run:
         - /bin/sh -c /usr/bin/logger -p daemon.info -t csc
         - /bin/sh -c /usr/bin/logger -p daemon.info -t oss
-        - /bin/sh -c /usr/bin/logger -p daemon.info -t oss
         - /bin/sh /usr/bin/mysqld_safe
         - collectd -C /etc/collectd/collectd.conf -f
         - nginx
@@ -15,19 +14,18 @@ running-processes:
         - startpar -f -- ngcp-rate-o-mat
         - /usr/bin/logger -p daemon.info -t csc
         - /usr/bin/logger -p daemon.info -t oss
-        - /usr/bin/logger -p daemon.info -t oss
-        - /usr/bin/mediator -D /var/run/mediator.pid -i 10 -h localhost -o 3306 -u kamailio
+        - /usr/bin/mediator
         - /usr/sbin/acpid
         - /usr/sbin/apache2
         - /usr/sbin/asterisk -n
-        - /usr/sbin/collectdmon -P /var/run/collectdmon.pid -- -C /etc/collectd/collectd.con
+        - /usr/sbin/collectdmon
         - /usr/sbin/cron
-        - /usr/sbin/exim4 -bd -q30m
+        - /usr/sbin/exim4
         - /usr/sbin/kamailio -f /etc/kamailio/lb/kamailio.cfg -P /var/run/kamailio/kamailio.lb.pid
         - /usr/sbin/kamailio -f /etc/kamailio/proxy/kamailio.cfg -P /var/run/kamailio/kamailio.proxy.pid
         - /usr/sbin/mediaproxy-ng
-        - /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --log-error=/var/log/mysql/mysqld.err --pid-file=/var/run/mysqld/mysqld.pid --socket=/var/run/mysqld/mysqld.sock --port=3306
-        - /usr/sbin/ntpd -p /var/run/ntpd.pid
+        - /usr/sbin/mysqld
+        - /usr/sbin/ntpd
         - /usr/sbin/rsyslogd
-        - /usr/sbin/sems -P /var/run/sems/sems.pid -u sems -g sems -f /etc/sems/sems.conf
+        - /usr/sbin/sems
         - /usr/sbin/sshd
diff --git a/pro/test-server.yaml b/pro/test-server.yaml
index b68852c..4366b87 100644
--- a/pro/test-server.yaml
+++ b/pro/test-server.yaml
@@ -10,30 +10,30 @@ running-processes:
         - /bin/sh -c /usr/bin/logger -p daemon.info -t oss
         - /bin/sh /usr/bin/mysqld_safe
         - collectd -C /etc/collectd/collectd.conf -f
-        - heartbeat: master control process
+        - "heartbeat: master control process"
         - rate-o-mat
         - udevd --daemon
         - /usr/bin/logger -p daemon.info -t csc
         - /usr/bin/logger -p daemon.info -t oss
-        - /usr/bin/mediator -D /var/run/mediator.pid
-        - /usr/bin/redis-server /etc/redis/redis.conf
+        - /usr/bin/mediator
+        - /usr/bin/redis-server
         - /usr/lib/heartbeat/ipfail
         - /usr/sbin/acpid
         - /usr/sbin/apache2
         - /usr/sbin/asterisk -n
-        - /usr/sbin/collectdmon -P /var/run/collectdmon.pid -- -C /etc/collectd/collectd.conf
+        - /usr/sbin/collectdmon
         - /usr/sbin/cron
         - /usr/sbin/exim4
-        - /usr/sbin/glusterfsd -p /var/run/glusterfsd.pid -f /etc/glusterfs/glusterfsd.vol --log-file /var/log/glusterfs/gluster
-        - /usr/sbin/glusterfs --log-level=NORMAL --volfile=/etc/glusterfs/glusterfs.vol /mnt/glusterfs
+        - /usr/sbin/glusterfsd
+        - /usr/sbin/glusterfs
         - /usr/sbin/haveged -w 1024
         - /usr/sbin/kamailio -f /etc/kamailio/lb/kamailio.cfg -P /var/run/kamailio/kamailio.lb.pid
         - /usr/sbin/kamailio -f /etc/kamailio/proxy/kamailio.cfg -P /var/run/kamailio/kamailio.proxy.pid
         - /usr/sbin/mediaproxy-ng
-        - /usr/sbin/monit -c /etc/monit/monitrc -s /var/lib/monit/monit.state
-        - /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --log-error=/var/log/mysql/mysqld.err --pid-file
-        - /usr/sbin/ntpd -p /var/run/ntpd.pid
-        - /usr/sbin/rsyslogd -c5
-        - /usr/sbin/sems -P /var/run/sems/sems.pid -u sems -g sems -f /etc/sems/sems.conf
-        - /usr/sbin/snmpd -Lsd -Lf /dev/null -u snmp -g snmp -I -smux -p /var/run/snmpd.pid
+        - /usr/sbin/monit
+        - /usr/sbin/mysqld
+        - /usr/sbin/ntpd
+        - /usr/sbin/rsyslogd
+        - /usr/sbin/sems
+        - /usr/sbin/snmpd
         - /usr/sbin/sshd