[Dev] [dbscripts] [PATCH 20/31] test: Don't direct {pushd, popd, svn, ftpdir-cleanup} to /dev/null
Luke Shumaker
lukeshu at lukeshu.com
Fri Apr 6 18:43:53 GMT 2018
From: Luke Shumaker <lukeshu at parabola.nu>
In Arch, this change was tucked away in d0b808b5a58023899c7e76958cdae732bbdfc08e
---
test/cases/ftpdir-cleanup.bats | 12 ++++++------
test/lib/common.bash | 14 +++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/test/cases/ftpdir-cleanup.bats b/test/cases/ftpdir-cleanup.bats
index 30d6d53..f1fd7e4 100755
--- a/test/cases/ftpdir-cleanup.bats
+++ b/test/cases/ftpdir-cleanup.bats
@@ -17,7 +17,7 @@ load ../lib/common
db-remove extra "${arch}" pkg-simple-a
done
- ftpdir-cleanup >/dev/null
+ ftpdir-cleanup
for arch in "${ARCH_BUILD[@]}"; do
local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
@@ -47,7 +47,7 @@ load ../lib/common
db-remove extra "${arch}" pkg-simple-epoch
done
- ftpdir-cleanup >/dev/null
+ ftpdir-cleanup
for arch in "${ARCH_BUILD[@]}"; do
local pkg1="pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz"
@@ -68,7 +68,7 @@ load ../lib/common
db-update
db-remove extra any pkg-any-a
- ftpdir-cleanup >/dev/null
+ ftpdir-cleanup
local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
checkRemovedAnyPackage extra 'pkg-any-a'
@@ -97,7 +97,7 @@ load ../lib/common
db-remove extra "${arch}" "${pkgs[0]}"
done
- ftpdir-cleanup >/dev/null
+ ftpdir-cleanup
for arch in "${ARCH_BUILD[@]}"; do
for pkg in $(getPackageNamesFromPackageBase "${pkgs[0]}"); do
@@ -131,7 +131,7 @@ load ../lib/common
done
done
- ftpdir-cleanup >/dev/null
+ ftpdir-cleanup
local pkgfilea="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
local pkgfileb="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
@@ -139,7 +139,7 @@ load ../lib/common
touch -d "-$(expr ${CLEANUP_KEEP} + 1)days" ${CLEANUP_DESTDIR}/${pkgfilea}{,.sig}
done
- ftpdir-cleanup >/dev/null
+ ftpdir-cleanup
[ ! -f ${CLEANUP_DESTDIR}/${pkgfilea} ]
[ -f ${CLEANUP_DESTDIR}/${pkgfileb} ]
diff --git a/test/lib/common.bash b/test/lib/common.bash
index 337b177..39ceeb4 100644
--- a/test/lib/common.bash
+++ b/test/lib/common.bash
@@ -25,7 +25,7 @@ __updatePKGBUILD() {
pkgrel=$(. PKGBUILD; expr ${pkgrel} + 1)
sed "s/pkgrel=.*/pkgrel=${pkgrel}/" -i PKGBUILD
- svn commit -q -m"update pkg to pkgrel=${pkgrel}" >/dev/null
+ svn commit -q -m"update pkg to pkgrel=${pkgrel}"
}
__getCheckSum() {
@@ -107,7 +107,7 @@ releasePackage() {
svn commit -q -m"initial commit of ${pkgbase}" "${TMP}/svn-packages-copy"
fi
- pushd "${TMP}/svn-packages-copy/${pkgbase}/trunk/" >/dev/null
+ pushd "${TMP}/svn-packages-copy/${pkgbase}/trunk/"
__buildPackage ${arch}
xbs release-client "${repo}" "${arch}"
pkgver=$(. PKGBUILD; get_full_version)
@@ -115,7 +115,7 @@ releasePackage() {
for p in "${pkgname[@]}"; do
cp "${p}-${pkgver}-${arch}"${PKGEXT}{,.sig} "${STAGING}/${repo}/"
done
- popd >/dev/null
+ popd
}
__buildPackage() {
@@ -156,10 +156,10 @@ updatePackage() {
local pkgbase=$1
local arch=$2
- pushd "${TMP}/svn-packages-copy/${pkgbase}/trunk/" >/dev/null
+ pushd "${TMP}/svn-packages-copy/${pkgbase}/trunk/"
__updatePKGBUILD
__buildPackage ${arch}
- popd >/dev/null
+ popd
}
updateRepoPKGBUILD() {
@@ -167,9 +167,9 @@ updateRepoPKGBUILD() {
local repo=$2
local arch=$3
- pushd "${TMP}/svn-packages-copy/${pkgbase}/repos/${repo}-${arch}/" >/dev/null
+ pushd "${TMP}/svn-packages-copy/${pkgbase}/repos/${repo}-${arch}/"
__updatePKGBUILD
- popd >/dev/null
+ popd
}
getPackageNamesFromPackageBase() {
--
2.16.2
More information about the Dev
mailing list