From owner-svn-src-head@freebsd.org Tue Mar 24 18:17:10 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 224EA2650F4; Tue, 24 Mar 2020 18:17:10 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mzwy2RM5z4H6b; Tue, 24 Mar 2020 18:17:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4303C3F32; Tue, 24 Mar 2020 18:16:57 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02OIGuZl003999; Tue, 24 Mar 2020 18:16:56 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02OIGucf003998; Tue, 24 Mar 2020 18:16:56 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202003241816.02OIGucf003998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 24 Mar 2020 18:16:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359277 - head/usr.sbin/newsyslog/tests X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.sbin/newsyslog/tests X-SVN-Commit-Revision: 359277 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2020 18:17:10 -0000 Author: markj Date: Tue Mar 24 18:16:56 2020 New Revision: 359277 URL: https://svnweb.freebsd.org/changeset/base/359277 Log: Add regression tests for newsyslog.conf's p flag. While here do a bit of cleanup: - declare local variables as such, - make tmpdir_create() clean up logfile directories, to handle a previously interrupt test run more gracefully. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/newsyslog/tests/legacy_test.sh Modified: head/usr.sbin/newsyslog/tests/legacy_test.sh ============================================================================== --- head/usr.sbin/newsyslog/tests/legacy_test.sh Tue Mar 24 18:16:36 2020 (r359276) +++ head/usr.sbin/newsyslog/tests/legacy_test.sh Tue Mar 24 18:16:56 2020 (r359277) @@ -194,7 +194,8 @@ ckstr() tmpdir_create() { - mkdir -p ${TMPDIR}/log ${TMPDIR}/alog + rm -rf ${TMPDIR}/log ${TMPDIR}/alog + mkdir ${TMPDIR}/log ${TMPDIR}/alog cd ${TMPDIR}/log } @@ -211,6 +212,8 @@ run_newsyslog() } tests_normal_rotate() { + local dir ext name_postfix newsyslog_args + ext="$1" dir="$2" @@ -286,6 +289,8 @@ tests_normal_rotate() { } tests_normal_rotate_keepn() { + local cnt dir ext name_postfix newsyslog_args + cnt="$1" ext="$2" dir="$3" @@ -354,6 +359,8 @@ tests_normal_rotate_keepn() { } tests_time_rotate() { + local dir ext name_postfix newsyslog_args + ext="$1" dir="$2" @@ -413,6 +420,8 @@ tests_time_rotate() { } tests_rfc5424() { + local dir ext name_postfix newsyslog_args + ext="$1" dir="$2" @@ -451,7 +460,73 @@ tests_rfc5424() { tmpdir_clean } -echo 1..180 +tests_p_flag_rotate() { + local ext + + ext="$1" + + tmpdir_create + + begin "create file" + run_newsyslog -C + ckfe $LOGFNAME + cknt ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + end + + begin "rotate p flag 1 ${ext}" + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.1${ext} + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.1${ext} + ckfe ${LOGFNAME}.2${ext} + end + + tmpdir_clean +} + +tests_normal_rotate_recompress() { + local ext + + ext=".gz" + + tmpdir_create + + begin "create file recompress" + run_newsyslog -C + ckfe $LOGFNAME + cknt ${LOGFNAME}.0${ext} + end + + begin "rotate normal 1" + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0${ext} + cknt ${LOGFNAME}.1${ext} + end + + begin "rotate recompress 1" + gunzip ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.1${ext} + end +} + +echo 1..185 mkdir -p ${TMPDIR} cd ${TMPDIR} @@ -556,5 +631,11 @@ tests_time_rotate "zst" "${TMPDIR}/alog/" echo "$LOGFPATH5424 640 3 * @T00 NCT" > newsyslog.conf echo "$LOGFPATH 640 3 * @T00 NC" >> newsyslog.conf tests_rfc5424 + +echo "$LOGFPATH 640 3 * @T00 NCpZ" > newsyslog.conf +tests_p_flag_rotate ".gz" + +echo "$LOGFPATH 640 3 * @T00 NCZ" > newsyslog.conf +tests_normal_rotate_recompress rm -rf "${TMPDIR}"