From 5074bc805f4d250467b8aa80fcf041a5be168141 Mon Sep 17 00:00:00 2001 From: Quentin De Coninck Date: Fri, 27 May 2016 17:03:33 +0200 Subject: [PATCH] mpExperience: prevent minitopo going bad by killing everything --- src/mpExperienceHTTPS.py | 1 + src/mpExperienceSiri.py | 1 + src/mpExperienceVLC.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mpExperienceHTTPS.py b/src/mpExperienceHTTPS.py index af13544..4092f8b 100644 --- a/src/mpExperienceHTTPS.py +++ b/src/mpExperienceHTTPS.py @@ -79,4 +79,5 @@ class MpExperienceHTTPS(MpExperience): self.mpTopo.commandTo(self.mpConfig.client, cmd) self.mpTopo.commandTo(self.mpConfig.server, "netstat -sn > netstat_server_after") self.mpTopo.commandTo(self.mpConfig.client, "netstat -sn > netstat_client_after") + self.mpTopo.commandTo(self.mpConfig.server, "pkill -f https.py") self.mpTopo.commandTo(self.mpConfig.client, "sleep 2") diff --git a/src/mpExperienceSiri.py b/src/mpExperienceSiri.py index a2dbb4e..f3a55bd 100644 --- a/src/mpExperienceSiri.py +++ b/src/mpExperienceSiri.py @@ -81,4 +81,5 @@ class MpExperienceSiri(MpExperience): self.mpTopo.commandTo(self.mpConfig.client, cmd) self.mpTopo.commandTo(self.mpConfig.server, "netstat -sn > netstat_server_after") self.mpTopo.commandTo(self.mpConfig.client, "netstat -sn > netstat_client_after") + self.mpTopo.commandTo(self.mpConfig.server, "pkill -f siri_server.py") self.mpTopo.commandTo(self.mpConfig.client, "sleep 2") diff --git a/src/mpExperienceVLC.py b/src/mpExperienceVLC.py index ed4c7d5..575fab1 100644 --- a/src/mpExperienceVLC.py +++ b/src/mpExperienceVLC.py @@ -86,6 +86,6 @@ class MpExperienceVLC(MpExperience): if self.time != "0" : self.mpTopo.commandTo(self.mpConfig.client, "sleep " + self.time) - self.mpTopo.commandTo(self.mpConfig.client, "pkill -9 vlc") + self.mpTopo.commandTo(self.mpConfig.client, "pkill -9 -f vlc") self.mpTopo.commandTo(self.mpConfig.client, "sleep 2")