From nobody Tue Jan 30 03:29:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP9d55vQwz5872w; Tue, 30 Jan 2024 03:29:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TP9d55Q3sz4HTq; Tue, 30 Jan 2024 03:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706585353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yr3NGWkQ3WlxIQ7jt6LB91dRfkS6SPrKCbx1f92Qt/s=; b=lDq3gDBiUb30tlO2WCVAWI1Q649MoA+VL4zySn/of2v6qJp/aM+M1IK5khn8Nt5Rhn6hT8 ZO+Fkk+8Q8GWOzrxi43jwS/gnBFFfP01flQ/c+RyFVdBn80dUqqyvnUAuiqS2fFK9xSNAM YwGaMq1y7+yRlusZ1arRVyDZRyiQmTmSawdXVjKheCs+C/Vnm7OIlMTLK+36PG5Uwyrlak brY5A4UckBVcU4PcXVPR+WfPS60jgvniUtnG6lsRgFbslOxeI7ojOJdAEGZVmkVyTf57aC wG2vAyClUHGjCaEXHKKySC6B0ti94Wx1YumWCPQfGi0e8re1TqMP7WUzg3Vcgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706585353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yr3NGWkQ3WlxIQ7jt6LB91dRfkS6SPrKCbx1f92Qt/s=; b=w1+SyB/1dVyV/7PsZnkXwT9h6THxPmpp1LqPlwGa+H9seDjDBdeO2bFr8aW6faM4461InU If63gwPs04OGeC9Vu1MiJ2BGOs6amvIlZ5KnRae7zfp1cP4Mu26F35rWOW54n48d8+chZb 6TRjTGj+kB8+4Se87J89Z6qCXrcMj1oF8BqQU+PVEly8LzhHvJMcgvGmdjX4MlvEh/D8ZT lPjWvJ8x/zWLB3Qd1ymdzunmH6QHNrq9d+m6uqIGfqN+Fo5gJvNh3garReC+vWyflql0ok +qb811qeC4GlvZ+hX+Blr6HVNq5IejfGMtmSnE5o8grgrS9lpMa0q7+S11v9Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706585353; a=rsa-sha256; cv=none; b=OmVuk2Bqqsg4lFWl0B0CJ70sj0W9DF85ZCIwhZjX9rPFw/6BdRNuKGmjusNrp24gzLuINc 7oPz8cjwS8Loyfk/RBx5P3g1L6XUnqFMVtKFtYcx9NmE+duaTd/F7L2YABhVSEiYvocniX La1ejMAm62/CjAIE1UCM11B74c0hykHZyjKs/nKKtZ4I6HkodOwJddpj4oR78oOO7gA0pj 5vDqY7j3kmHZt0bABqeCy9qwkjsGoPoxogi2yHWVtXiGUArNpq+9yZy9edF76qlPECYd9H 2jUfcoUBJ2Oyhq+2aeQ7SG0Ys1ZEhGSgacv4bUuEnSJrApLPow7uNuc3pyfzZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP9d54TjpzJJb; Tue, 30 Jan 2024 03:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40U3TDkc002388; Tue, 30 Jan 2024 03:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40U3TDwK002385; Tue, 30 Jan 2024 03:29:13 GMT (envelope-from git) Date: Tue, 30 Jan 2024 03:29:13 GMT Message-Id: <202401300329.40U3TDwK002385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 73974a78f7f6 - main - hostname(1): Add test cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d commit 73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d Author: Lin Lee AuthorDate: 2024-01-17 04:30:29 +0000 Commit: Li-Wen Hsu CommitDate: 2024-01-30 03:26:57 +0000 hostname(1): Add test cases Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1069 --- bin/hostname/Makefile | 4 ++ bin/hostname/tests/Makefile | 6 +++ bin/hostname/tests/hostname_test.sh | 87 +++++++++++++++++++++++++++++++++++++ etc/mtree/BSD.tests.dist | 2 + 4 files changed, 99 insertions(+) diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile index 683611b17299..14628b7850d4 100644 --- a/bin/hostname/Makefile +++ b/bin/hostname/Makefile @@ -1,5 +1,9 @@ +.include PACKAGE=runtime PROG= hostname +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include diff --git a/bin/hostname/tests/Makefile b/bin/hostname/tests/Makefile new file mode 100644 index 000000000000..87295101392f --- /dev/null +++ b/bin/hostname/tests/Makefile @@ -0,0 +1,6 @@ +PACKAGE= tests + +ATF_TESTS_SH= hostname_test +BINDIR= ${TESTSDIR} + +.include diff --git a/bin/hostname/tests/hostname_test.sh b/bin/hostname/tests/hostname_test.sh new file mode 100644 index 000000000000..57517821f7f1 --- /dev/null +++ b/bin/hostname/tests/hostname_test.sh @@ -0,0 +1,87 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Lin Lee +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# +# These tests need to run in a multibyte locale with non-localized +# error messages. +# +export LC_CTYPE=C.UTF-8 +export LC_MESSAGES=C + +test_jail_name="test-hostname-jail" + +test_jail_conf='%%test_jail_name%% { + host.hostname = "test-hostname.example.org"; + path = "/"; + persist; +}' + +init() +{ + echo "${test_jail_conf}" | \ + sed -e "s/%%test_jail_name%%/${test_jail_name}/" > "./jail.conf" + jail -f "./jail.conf" -c ${test_jail_name} +} + +recycle() +{ + jail -f "./jail.conf" -r ${test_jail_name} + rm "./jail.conf" +} + +atf_test_case basic cleanup +basic_head() +{ + atf_set require.user root + atf_set "descr" "basic test for getting hostname" +} +basic_body() +{ + init + + result=$(jexec ${test_jail_name} "hostname") + atf_check_equal "test-hostname.example.org" "${result}" + + result=$(jexec ${test_jail_name} "hostname" -s) + atf_check_equal "test-hostname" "${result}" + + result=$(jexec ${test_jail_name} "hostname" -d) + atf_check_equal "example.org" "${result}" + + jexec ${test_jail_name} "hostname" "test-bsd2" + result=$(jexec ${test_jail_name} "hostname") + atf_check_equal "test-bsd2" "${result}" +} +basic_cleanup() +{ + recycle +} + +atf_init_test_cases() +{ + atf_add_test_case basic +} diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 660883ed848a..2f7d74cb58f8 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -33,6 +33,8 @@ .. expr .. + hostname + .. ln .. ls