@@ -38,6 +38,8 @@ stop_dhcp()
init()
{
+ [ -z "$log" ] && log="$PWD/$(basename $0 '.sh').log"
+
if [ $TST_IPV6 ]; then
ip_addr="fd00:1:1:2::12/64"
ip_addr_check="fd00:1:1:2::100/64"
@@ -89,6 +91,11 @@ cleanup()
[ "$veth_loaded" = "no" ] && lsmod | grep -q '^veth ' && rmmod veth
}
+print_dhcp_log()
+{
+ [ -f "$log" ] && cat $log
+}
+
test01()
{
local wicked
@@ -31,7 +31,7 @@ setup_dhcpd_conf()
start_dhcpd()
{
touch tst_hdcpd.lease
- dhcpd -lf tst_hdcpd.lease -$TST_IPVER $iface0 > tst_dhcpd.err 2>&1
+ dhcpd -lf tst_hdcpd.lease -$TST_IPVER $iface0 > $log 2>&1
}
start_dhcp()
@@ -69,11 +69,6 @@ cleanup_dhcp()
[ -f dhcpd.conf ] && mv dhcpd.conf $DHCPD_CONF
}
-print_dhcp_log()
-{
- cat tst_dhcpd.err
-}
-
print_dhcp_version()
{
dhcpd --version 2>&1
@@ -38,11 +38,6 @@ cleanup_dhcp()
rm -f $log
}
-print_dhcp_log()
-{
- cat $log
-}
-
print_dhcp_version()
{
dnsmasq --version | head -2
Create default path for log file, but allow test to specify it. This is needed for AppArmor respected paths, which was already defined in 3e76b9896 ("net/dhcp: Use paths allowed by AppArmor for dnsmasq"). Also check if file exists. This is needed for dnsmasq --log-facility switch when AppArmor enabled, because according to dnsmasq(8) errors whilst reading configuration will still go to syslog. And then error report of cat of missing file is misleading. Signed-off-by: Petr Vorel <pvorel@suse.cz> --- testcases/network/dhcp/dhcp_lib.sh | 7 +++++++ testcases/network/dhcp/dhcpd_tests.sh | 7 +------ testcases/network/dhcp/dnsmasq_tests.sh | 5 ----- 3 files changed, 8 insertions(+), 11 deletions(-)