From b69a399b52c3cdd287db649216a18bac2f172d40 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 13 Jun 2019 02:25:53 +0200 Subject: [PATCH] tests/xbps-checkvers: update tests for new output format. Signed-off-by: Juan RP --- tests/xbps/xbps-checkvers/checkvers.sh | 56 +++++++++++++------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/xbps/xbps-checkvers/checkvers.sh b/tests/xbps/xbps-checkvers/checkvers.sh index aff6318a..a1e75d2c 100755 --- a/tests/xbps/xbps-checkvers/checkvers.sh +++ b/tests/xbps/xbps-checkvers/checkvers.sh @@ -3,7 +3,7 @@ atf_test_case srcpkg_older srcpkg_older_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg contains an older version" + atf_set "descr" "xbps-checkvers(1): test when srcpkg contains an older version" } srcpkg_older_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -22,7 +22,7 @@ EOF xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` + out=$(xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages) atf_check_equal $? 0 atf_check_equal "$out" "" } @@ -30,7 +30,7 @@ EOF atf_test_case srcpkg_older_with_refs srcpkg_older_with_refs_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg contains an older version with refs" + atf_set "descr" "xbps-checkvers(1): test when srcpkg contains an older version with refs" } srcpkg_older_with_refs_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -51,7 +51,7 @@ EOF xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` + out=$(xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages) atf_check_equal $? 0 atf_check_equal "$out" "" } @@ -59,7 +59,7 @@ EOF atf_test_case srcpkg_newer srcpkg_newer_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg contains a newer version" + atf_set "descr" "xbps-checkvers(1): test when srcpkg contains a newer version" } srcpkg_newer_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -78,15 +78,15 @@ EOF xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` + out=$(xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages) atf_check_equal $? 0 - atf_check_equal "$out" "pkgname: A repover: 1.0_1 srcpkgver: 1.1_1" + atf_check_equal "$out" "A 1.0_1 1.1_1" } atf_test_case srcpkg_newer_with_refs srcpkg_newer_with_refs_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg contains a newer version with refs" + atf_set "descr" "xbps-checkvers(1): test when srcpkg contains a newer version with refs" } srcpkg_newer_with_refs_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -107,15 +107,15 @@ EOF xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` + out=$(xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages) atf_check_equal $? 0 - atf_check_equal "$out" "pkgname: A repover: 1.0_1 srcpkgver: 1.1_1" + atf_check_equal "$out" "A 1.0_1 1.1_1" } atf_test_case srcpkg_newer_with_refs_and_source srcpkg_newer_with_refs_and_source_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg contains a newer version with refs and file sourcing" + atf_set "descr" "xbps-checkvers(1): test when srcpkg contains a newer version with refs and file sourcing" } srcpkg_newer_with_refs_and_source_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -137,15 +137,15 @@ EOF xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` + out=$(xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages) atf_check_equal $? 0 - atf_check_equal "$out" "pkgname: A repover: 1.0_1 srcpkgver: 1.1_1" + atf_check_equal "$out" "A 1.0_1 1.1_1" } atf_test_case srcpkg_missing_pkgname srcpkg_missing_pkgname_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg does not set pkgname" + atf_set "descr" "xbps-checkvers(1): test when srcpkg does not set pkgname" } srcpkg_missing_pkgname_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -171,7 +171,7 @@ EOF atf_test_case srcpkg_missing_version srcpkg_missing_version_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg does not set version" + atf_set "descr" "xbps-checkvers(1): test when srcpkg does not set version" } srcpkg_missing_version_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -197,7 +197,7 @@ EOF atf_test_case srcpkg_missing_revision srcpkg_missing_revision_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg does not set revision" + atf_set "descr" "xbps-checkvers(1): test when srcpkg does not set revision" } srcpkg_missing_revision_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -223,7 +223,7 @@ EOF atf_test_case srcpkg_missing_pkgver srcpkg_missing_pkgver_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg does not set pkgname/version" + atf_set "descr" "xbps-checkvers(1): test when srcpkg does not set pkgname/version" } srcpkg_missing_pkgver_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -249,7 +249,7 @@ EOF atf_test_case srcpkg_missing_pkgverrev srcpkg_missing_pkgverrev_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg does not set pkgname/version/revision" + atf_set "descr" "xbps-checkvers(1): test when srcpkg does not set pkgname/version/revision" } srcpkg_missing_pkgverrev_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/A @@ -275,7 +275,7 @@ EOF atf_test_case srcpkg_with_a_ref srcpkg_with_a_ref_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg does set a ref in pkgname/version/revision" + atf_set "descr" "xbps-checkvers(1): test when srcpkg does set a ref in pkgname/version/revision" } srcpkg_with_a_ref_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/foo @@ -296,13 +296,13 @@ EOF cd .. xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages >out atf_check_equal $? 0 - atf_check_equal "$(cat out)" "pkgname: foo repover: 1.0_1 srcpkgver: 1.1_1" + atf_check_equal "$(cat out)" "foo 1.0_1 1.1_1" } atf_test_case srcpkg_with_a_ref_and_comment srcpkg_with_a_ref_and_comment_head() { - atf_set "descr" "xbps-checkvers(8): test when srcpkg does set a ref in pkgname/version/revision with a comment" + atf_set "descr" "xbps-checkvers(1): test when srcpkg does set a ref in pkgname/version/revision with a comment" } srcpkg_with_a_ref_and_comment_body() { mkdir -p some_repo pkg_A void-packages/srcpkgs/foo @@ -322,13 +322,13 @@ EOF cd .. xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages >out atf_check_equal $? 0 - atf_check_equal "$(cat out)" "pkgname: foo repover: 1.0_1 srcpkgver: 1.1_1" + atf_check_equal "$(cat out)" "foo 1.0_1 1.1_1" } atf_test_case reverts reverts_head() { - atf_set "descr" "xbps-checkvers(8): test with reverts" + atf_set "descr" "xbps-checkvers(1): test with reverts" } reverts_body() { @@ -349,15 +349,15 @@ EOF xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` + out=$(xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages) atf_check_equal $? 0 - atf_check_equal "$out" "pkgname: A repover: 1.1_1 srcpkgver: 1.0_1" + atf_check_equal "$out" "A 1.1_1 1.0_1" } atf_test_case reverts_alpha reverts_alpha_head() { - atf_set "descr" "xbps-checkvers(8): test with reverts containing an alphanumeric character" + atf_set "descr" "xbps-checkvers(1): test with reverts containing an alphanumeric character" } reverts_alpha_body() { @@ -379,9 +379,9 @@ EOF atf_check_equal $? 0 cd .. xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages - out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` + out=$(xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages) atf_check_equal $? 0 - atf_check_equal "$out" "pkgname: fs-utils repover: 1.10_1 srcpkgver: 1.10_1" + atf_check_equal "$out" "fs-utils 1.10_1 1.10_1" } atf_init_test_cases() {