From patchwork Thu Oct 11 22:05:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 982750 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42WQ5R6TqVz9s8J for ; Fri, 12 Oct 2018 09:05:47 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 253793E6ED2 for ; Fri, 12 Oct 2018 00:05:45 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) by picard.linux.it (Postfix) with ESMTP id 1E6D43E6DCC for ; Fri, 12 Oct 2018 00:05:35 +0200 (CEST) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 91EB9600850 for ; Fri, 12 Oct 2018 00:05:35 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2108BAE0B; Thu, 11 Oct 2018 22:05:35 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 12 Oct 2018 00:05:23 +0200 Message-Id: <20181011220525.24628-3-pvorel@suse.cz> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181011220525.24628-1-pvorel@suse.cz> References: <20181011220525.24628-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH 2/4] net/dhcp: Move print_dhcp_log() into dhcp library X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" 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 --- 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(-) diff --git a/testcases/network/dhcp/dhcp_lib.sh b/testcases/network/dhcp/dhcp_lib.sh index 29b8027de..fb8b8840a 100755 --- a/testcases/network/dhcp/dhcp_lib.sh +++ b/testcases/network/dhcp/dhcp_lib.sh @@ -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 diff --git a/testcases/network/dhcp/dhcpd_tests.sh b/testcases/network/dhcp/dhcpd_tests.sh index ff46b825d..e8339932b 100755 --- a/testcases/network/dhcp/dhcpd_tests.sh +++ b/testcases/network/dhcp/dhcpd_tests.sh @@ -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 diff --git a/testcases/network/dhcp/dnsmasq_tests.sh b/testcases/network/dhcp/dnsmasq_tests.sh index 43961f85f..e034f4f63 100755 --- a/testcases/network/dhcp/dnsmasq_tests.sh +++ b/testcases/network/dhcp/dnsmasq_tests.sh @@ -38,11 +38,6 @@ cleanup_dhcp() rm -f $log } -print_dhcp_log() -{ - cat $log -} - print_dhcp_version() { dnsmasq --version | head -2