From 618517fd9b8c9a2345b5132cad8f719258bbfcc6 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Thu, 10 Sep 2015 11:15:39 +0100
Subject: [PATCH] traffic-control: Clean up tcmmd process on test failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the manual run-tcmmd-test fails because the user replies ‘no’ to any
of the questions, it doesn’t clean up its tcmmd process. This causes an
immediate failure of the test if it’s run again. Fix that by always
cleaning up tcmmd.

Differential Revision: https://phabricator.apertis.org/D427
Signed-off-by: Philip Withnall <philip.withnall@collabora.co.uk>
---
 traffic-control/manual/run-tcmmd-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/traffic-control/manual/run-tcmmd-test.sh b/traffic-control/manual/run-tcmmd-test.sh
index e196acd..61be6a9 100755
--- a/traffic-control/manual/run-tcmmd-test.sh
+++ b/traffic-control/manual/run-tcmmd-test.sh
@@ -102,6 +102,7 @@ check_decent_speed() {
 check_tcmmd() {
   sudo $TCMMD -i $NET_INTERFACE &>/dev/null &
   TCMMD_PID=$!
+  ROOT_PROC_KILL_LIST+=($TCMMD_PID)
   sleep 0.5
   if ! sudo kill -s 0 $TCMMD_PID &> /dev/null ; then
     return 1
-- 
GitLab