diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/artifacts/test.basic-functionality-test.log b/tests/artifacts/test.basic-functionality-test.log deleted file mode 100644 index 5c74efd..0000000 --- a/tests/artifacts/test.basic-functionality-test.log +++ /dev/null @@ -1,261 +0,0 @@ -posix on -:: [ 12:25:31 ] :: [ WARNING ] :: POSIX mode detected and switched off -:: [ 12:25:31 ] :: [ WARNING ] :: POSIX mode detected and switched off -:: [ 12:25:31 ] :: [ WARNING ] :: Please fix your test to have /bin/bash shebang -:: [ 12:25:31 ] :: [ WARNING ] :: Please fix your test to have /bin/bash shebang - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: Setup -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -which-2.21-4.fc27.x86_64 -:: [ PASS ] :: Checking for the presence of which rpm -:: [ 12:25:31 ] :: Package versions: -:: [ 12:25:31 ] :: Package versions: -:: [ 12:25:31 ] :: which-2.21-4.fc27.x86_64 -:: [ 12:25:31 ] :: which-2.21-4.fc27.x86_64 -:: [ BEGIN ] :: Creating tmp directory :: actually running 'TmpDir=$(mktemp -d)' -:: [ BEGIN ] :: Creating tmp directory :: actually running 'TmpDir=$(mktemp -d)' -:: [ PASS ] :: Creating tmp directory (Expected 0, got 0) -:: [ BEGIN ] :: Running 'pushd /tmp/tmp.cVaYqMMJWL' -:: [ BEGIN ] :: Running 'pushd /tmp/tmp.cVaYqMMJWL' -/tmp/tmp.cVaYqMMJWL /usr/local/bin/basic-functionality-test -:: [ PASS ] :: Command 'pushd /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0) -:: [ BEGIN ] :: Running 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL' -:: [ BEGIN ] :: Running 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL' -:: [ PASS ] :: Command 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0) - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test --version -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ BEGIN ] :: Running 'VERSION=$( rpm -q --qf '%{VERSION}' which )' -:: [ BEGIN ] :: Running 'VERSION=$( rpm -q --qf '%{VERSION}' which )' -:: [ PASS ] :: Command 'VERSION=$( rpm -q --qf '%{VERSION}' which )' (Expected 0, got 0) -:: [ BEGIN ] :: Running 'which --version' -:: [ BEGIN ] :: Running 'which --version' -GNU which v2.21, Copyright (C) 1999 - 2015 Carlo Wood. -GNU which comes with ABSOLUTELY NO WARRANTY; -This program is free software; your freedom to use, change -and distribute this program is protected by the GPL. -:: [ PASS ] :: Command 'which --version' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.0WBy8LPp' should contain 'GNU which v2.21' - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test locating the bash binary -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ BEGIN ] :: Running 'which bash' -:: [ BEGIN ] :: Running 'which bash' -/bin/bash -:: [ PASS ] :: Command 'which bash' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.eBwKSEjp' should contain '/bin/bash' - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test an alias -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ BEGIN ] :: Running 'echo 'alias foo=bar' > bashrc' -:: [ BEGIN ] :: Running 'echo 'alias foo=bar' > bashrc' -:: [ PASS ] :: Command 'echo 'alias foo=bar' > bashrc' (Expected 0, got 0) -:: [ BEGIN ] :: Running 'echo -e 'alias foo=true -which foo' | bash -i' -:: [ BEGIN ] :: Running 'echo -e 'alias foo=true -which foo' | bash -i' -[root@localhost tmp.cVaYqMMJWL]# alias foo=true -[root@localhost tmp.cVaYqMMJWL]# which foo -]0;root@localhost:/tmp/tmp.cVaYqMMJWL]0;root@localhost:/tmp/tmp.cVaYqMMJWLalias foo='true' - /bin/true -[root@localhost tmp.cVaYqMMJWL]# exit -]0;root@localhost:/tmp/tmp.cVaYqMMJWL:: [ PASS ] :: Command 'echo -e 'alias foo=true\nwhich foo' | bash -i' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain 'alias foo='true'' -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain '/bin/true' - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test non existing command -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ BEGIN ] :: Running 'which foobar' -:: [ BEGIN ] :: Running 'which foobar' -which: no foobar in (/sbin:/bin:/usr/sbin:/usr/bin) -:: [ PASS ] :: Command 'which foobar' (Expected 1, got 1) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.qmmfZVfo' should contain 'no foobar in (/sbin:/bin:/usr/sbin:/usr/bin)' - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test with customized PATH -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true'' -:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true'' -/tmp/tmp.cVaYqMMJWL/true -:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true'' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.1ondAtov' should contain '/tmp/tmp.cVaYqMMJWL/true' - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test options -a / --all -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true'' -:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true'' -/tmp/tmp.cVaYqMMJWL/true -/bin/true -/usr/bin/true -:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true'' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/tmp/tmp.cVaYqMMJWL/true' -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/bin/true' -:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true'' -:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true'' -/tmp/tmp.cVaYqMMJWL/true -/bin/true -/usr/bin/true -:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true'' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/tmp/tmp.cVaYqMMJWL/true' -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/bin/true' - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: Cleanup -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ BEGIN ] :: Running 'popd' -:: [ BEGIN ] :: Running 'popd' -/usr/local/bin/basic-functionality-test -:: [ PASS ] :: Command 'popd' (Expected 0, got 0) -:: [ BEGIN ] :: Removing tmp directory :: actually running 'rm -r /tmp/tmp.cVaYqMMJWL' -:: [ BEGIN ] :: Removing tmp directory :: actually running 'rm -r /tmp/tmp.cVaYqMMJWL' -:: [ PASS ] :: Removing tmp directory (Expected 0, got 0) - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: TEST PROTOCOL -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ LOG ] :: Package : unknown -:: [ LOG ] :: Installed : which-2.21-4.fc27.x86_64 -:: [ LOG ] :: beakerlib RPM : beakerlib-1.16-4.fc27 -:: [ LOG ] :: bl-redhat RPM : not installed -:: [ LOG ] :: Test started : 2017-12-11 12:25:31 EET -:: [ LOG ] :: Test finished : 2017-12-11 12:25:34 EET -:: [ LOG ] :: Test name : basic-functionality-test -:: [ LOG ] :: Distro : Fedora release 27 (Twenty Seven) -:: [ LOG ] :: Hostname : localhost.localdomain -:: [ LOG ] :: Architecture : x86_64 - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: Test description -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -PURPOSE of /CoreOS/which/Sanity/basic-functionality-test -Description: tests basic functionality -Author: Karel Srot - -tests following scenarios: - * test --version - * test locating the bash binary - * test an alias - * test non existing command - * test with customized PATH - * test options -a / --all - -:: [ WARNING ] :: POSIX mode detected and switched off -:: [ WARNING ] :: Please fix your test to have /bin/bash shebang - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: Setup -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Checking for the presence of which rpm -:: [ LOG ] :: Package versions: -:: [ LOG ] :: which-2.21-4.fc27.x86_64 -:: [ PASS ] :: Creating tmp directory (Expected 0, got 0) -:: [ PASS ] :: Command 'pushd /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0) -:: [ PASS ] :: Command 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0) -:: [ LOG ] :: Duration: 1s -:: [ LOG ] :: Assertions: 4 good, 0 bad -:: [ PASS ] :: RESULT: Setup - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test --version -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Command 'VERSION=$( rpm -q --qf '%{VERSION}' which )' (Expected 0, got 0) -:: [ PASS ] :: Command 'which --version' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.0WBy8LPp' should contain 'GNU which v2.21' -:: [ LOG ] :: Duration: 0s -:: [ LOG ] :: Assertions: 3 good, 0 bad -:: [ PASS ] :: RESULT: test --version - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test locating the bash binary -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Command 'which bash' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.eBwKSEjp' should contain '/bin/bash' -:: [ LOG ] :: Duration: 0s -:: [ LOG ] :: Assertions: 2 good, 0 bad -:: [ PASS ] :: RESULT: test locating the bash binary - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test an alias -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Command 'echo 'alias foo=bar' > bashrc' (Expected 0, got 0) -:: [ PASS ] :: Command 'echo -e 'alias foo=true\nwhich foo' | bash -i' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain 'alias foo='true'' -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain '/bin/true' -:: [ LOG ] :: Duration: 0s -:: [ LOG ] :: Assertions: 4 good, 0 bad -:: [ PASS ] :: RESULT: test an alias - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test non existing command -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Command 'which foobar' (Expected 1, got 1) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.qmmfZVfo' should contain 'no foobar in (/sbin:/bin:/usr/sbin:/usr/bin)' -:: [ LOG ] :: Duration: 0s -:: [ LOG ] :: Assertions: 2 good, 0 bad -:: [ PASS ] :: RESULT: test non existing command - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test with customized PATH -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true'' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.1ondAtov' should contain '/tmp/tmp.cVaYqMMJWL/true' -:: [ LOG ] :: Duration: 0s -:: [ LOG ] :: Assertions: 2 good, 0 bad -:: [ PASS ] :: RESULT: test with customized PATH - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: test options -a / --all -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true'' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/tmp/tmp.cVaYqMMJWL/true' -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/bin/true' -:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true'' (Expected 0, got 0) -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/tmp/tmp.cVaYqMMJWL/true' -:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/bin/true' -:: [ LOG ] :: Duration: 1s -:: [ LOG ] :: Assertions: 6 good, 0 bad -:: [ PASS ] :: RESULT: test options -a / --all - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: Cleanup -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ PASS ] :: Command 'popd' (Expected 0, got 0) -:: [ PASS ] :: Removing tmp directory (Expected 0, got 0) -:: [ LOG ] :: Duration: 0s -:: [ LOG ] :: Assertions: 2 good, 0 bad -:: [ PASS ] :: RESULT: Cleanup - -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: [ LOG ] :: basic-functionality-test -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - -:: [ LOG ] :: Phases: 8 good, 0 bad -:: [ PASS ] :: RESULT: basic-functionality-test -:: [ 12:25:34 ] :: JOURNAL XML: /var/tmp/beakerlib-3xyUzEH/journal.xml -:: [ 12:25:34 ] :: JOURNAL XML: /var/tmp/beakerlib-3xyUzEH/journal.xml -:: [ 12:25:34 ] :: JOURNAL TXT: /var/tmp/beakerlib-3xyUzEH/journal.txt -:: [ 12:25:34 ] :: JOURNAL TXT: /var/tmp/beakerlib-3xyUzEH/journal.txt diff --git a/tests/artifacts/test.log b/tests/artifacts/test.log deleted file mode 100644 index efaf4f6..0000000 --- a/tests/artifacts/test.log +++ /dev/null @@ -1 +0,0 @@ -PASS basic-functionality-test diff --git a/tests/basic-functionality-test/main.fmf b/tests/basic-functionality-test/main.fmf new file mode 100644 index 0000000..5c98a29 --- /dev/null +++ b/tests/basic-functionality-test/main.fmf @@ -0,0 +1,14 @@ +summary: tests basic functionality +description: "tests following scenarios:\n * test --version\n * test locating the + bash binary\n * test an alias\n * test non existing command\n * test with customized + PATH\n * test options -a / --all\n" +contact: Karel Srot +component: + - which +test: ./runtest.sh +framework: beakerlib +recommend: + - which +duration: 5m +extra-summary: /CoreOS/which/Sanity/basic-functionality-test +extra-task: /CoreOS/which/Sanity/basic-functionality-test diff --git a/tests/basic-functionality-test/runtest.sh b/tests/basic-functionality-test/runtest.sh index d46f002..c33c1c6 100755 --- a/tests/basic-functionality-test/runtest.sh +++ b/tests/basic-functionality-test/runtest.sh @@ -27,7 +27,6 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 PACKAGE="which" diff --git a/tests/tests.retry b/tests/tests.retry deleted file mode 100644 index 2fbb50c..0000000 --- a/tests/tests.retry +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index b5b96d8..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Run tests in all contexts -- hosts: localhost - tags: - - classic - - container - - atomic - roles: - - role: standard-test-beakerlib - tests: - - basic-functionality-test - required_packages: - - which diff --git a/which.spec b/which.spec index 317c1e3..7174222 100644 --- a/which.spec +++ b/which.spec @@ -3,7 +3,7 @@ Summary: Displays where a particular program in your path is located Name: which Version: 2.23 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-3.0-only Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz Source1: which2.sh @@ -46,6 +46,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %{_mandir}/man1/which.1* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jun 18 2025 Than Ngo - 2.23-2 - Add a check to ensure that /proc/$$/exe can be read