Selaa lähdekoodia

tests: use pkill instead of killall

killall isn't installed by default
Marek Marczykowski-Górecki 5 vuotta sitten
vanhempi
commit
66de41ac26
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      qubes/tests/integ/network.py

+ 2 - 2
qubes/tests/integ/network.py

@@ -107,7 +107,7 @@ class VmNetworkingMixin(object):
         run_netvm_cmd("iptables -I INPUT -d {} -j ACCEPT --wait".format(
             self.test_ip))
         # ignore failure
-        self.run_cmd(self.testnetvm, "killall --wait dnsmasq")
+        self.run_cmd(self.testnetvm, "pkill dnsmasq")
         run_netvm_cmd("dnsmasq -a {ip} -A /{name}/{ip} -i test0 -z".format(
             ip=self.test_ip, name=self.test_name))
         run_netvm_cmd("echo nameserver {} > /etc/resolv.conf".format(
@@ -786,7 +786,7 @@ class VmIPv6NetworkingMixin(VmNetworkingMixin):
         run_netvm_cmd(
             "ip6tables -I INPUT -d {} -j ACCEPT".format(self.test_ip6))
         # ignore failure
-        self.run_cmd(self.testnetvm, "killall --wait dnsmasq")
+        self.run_cmd(self.testnetvm, "pkill dnsmasq")
         run_netvm_cmd(
             "dnsmasq -a {ip} -A /{name}/{ip} -A /{name}/{ip6} -i test0 -z".
             format(ip=self.test_ip, ip6=self.test_ip6, name=self.test_name))