CTS: get GenStopAllBeekhof working a bit better

Reviewed-by: Steven Dake <sdake@redhat.com>
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

cts/corosync.py

@@ -440,6 +440,7 @@ class TestAgent(object):
         self.env.debug('test agent: stopping %s on node %s' % (self.binary, self.node))
         self.rsh(self.node, "killall " + self.binary + " 2>/dev/null")
         self.sock.close ()
+        self.rsh(self.node, "killall -9 " + self.binary + " 2>/dev/null")
         self.started = False
 
     def kill(self):

cts/corotests.py

@@ -1123,7 +1123,7 @@ class GenStopAllBeekhof(CoroTest):
             self.CM.cpg_agent[n].pcmk_test()
 
         for n in self.CM.Env["nodes"]:
-            self.CM.cpg_agent[n].msg_blaster(10000)
+            self.CM.cpg_agent[n].msg_blaster(1000)
 
         for n in self.CM.Env["nodes"]:
             self.CM.cpg_agent[n].cfg_shutdown()
@@ -1147,9 +1147,6 @@ class GenStopAllBeekhof(CoroTest):
         
         waited = int(time.time()) - stopping
         if waited > max_wait:
-            for v in still_up:
-                self.CM.log("%s killing corosync on %s" % (self.name, v))
-                self.CM.rsh(v, 'killall -SIGSEGV corosync cpg_test_agent')
             return self.failure("Waited %d secs for nodes: %s to stop" % (waited, str(still_up)))
 
         self.CM.log("%s ALL good            (waited %d secs)" % (self.name, waited))