From 66ae94cafb62da09da77712269f411f095dd81fc Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 7 Aug 2010 20:05:58 +0200
Subject: add an initial set of tests

---
 test/runTest | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100755 test/runTest

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
new file mode 100755
index 0000000..1d54ea4
--- /dev/null
+++ b/test/runTest
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+curdir=$(readlink -e $(dirname $0))
+. "${curdir}/lib/common.inc"
+
+
+testAddSimplePackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-a' 'pkg-simple-b')
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update extra
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			checkPackage extra ${pkgbase}-1-1-${arch}.pkg.tar.xz ${arch}
+		done
+	done
+}
+
+testAddAnyPackages() {
+	local pkgs=('pkg-any-a' 'pkg-any-b')
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		releasePackage extra ${pkgbase} any
+	done
+
+	../db-update extra
+
+	for pkgbase in ${pkgs[@]}; do
+		checkAnyPackage extra ${pkgbase}-1-1-any.pkg.tar.xz
+	done
+}
+
+testAddSplitPackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-split-a' 'pkg-split-b')
+	local pkg
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update extra
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			for pkg in "${pkgdir}/${pkgbase}"/*-${arch}.pkg.tar.*; do
+				checkPackage extra $(basename ${pkg}) ${arch}
+			done
+		done
+	done
+}
+
+
+. "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From bccf84211be4abda3c96ded43f03b597081fecb1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 7 Aug 2010 21:21:08 +0200
Subject: add test for db-remove

---
 test/runTest | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 1d54ea4..258a181 100755
--- a/test/runTest
+++ b/test/runTest
@@ -3,6 +3,23 @@
 curdir=$(readlink -e $(dirname $0))
 . "${curdir}/lib/common.inc"
 
+#
+# self test
+#
+
+testPackages() {
+	local p
+	for p in "${pkgdir}"/*; do
+		pushd $p >/dev/null
+		namcap *.pkg.tar.* || fail 'namcap failed'
+		popd >/dev/null
+	done
+}
+
+
+#
+# db-update
+#
 
 testAddSimplePackages() {
 	local arches=('i686' 'x86_64')
@@ -63,4 +80,65 @@ testAddSplitPackages() {
 }
 
 
+#
+# db-remove
+#
+
+testRemovePackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b')
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update extra
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			../db-remove ${pkgbase} extra ${arch}
+		done
+	done
+
+	for arch in ${arches[@]}; do
+		[ -z "$(bsdtar -tf "${FTP_BASE}/extra/os/${arch}/extra.db.tar.gz" -O)" ] || fail "extra/os/${arch}/${repo}.db.tar.gz should be empty"
+	done
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			svn up -q "${TMP}/svn-packages-copy/${pkgbase}"
+			[ -d "${TMP}/svn-packages-copy/${pkgbase}/repos/extra-${arch}" ] && fail "svn-packages-copy/${pkgbase}/repos/extra-${arch} should not exist"
+		done
+	done
+}
+
+testRemoveAnyPackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-any-a' 'pkg-any-b')
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		releasePackage extra ${pkgbase} any
+	done
+
+	../db-update extra
+
+	for pkgbase in ${pkgs[@]}; do
+		../db-remove ${pkgbase} extra any
+	done
+
+	for arch in ${arches[@]}; do
+		[ -z "$(bsdtar -tf "${FTP_BASE}/extra/os/${arch}/extra.db.tar.gz" -O)" ] || fail "extra/os/${arch}/${repo}.db.tar.gz should be empty"
+	done
+
+	for pkgbase in ${pkgs[@]}; do
+		svn up -q "${TMP}/svn-packages-copy/${pkgbase}"
+		[ -d "${TMP}/svn-packages-copy/${pkgbase}/repos/extra-any" ] && fail "svn-packages-copy/${pkgbase}/repos/extra-any should not exist"
+	done
+}
+
+
 . "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From 76ef37d1b1e03b0c517f8513b943474ea379738e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 7 Aug 2010 23:48:03 +0200
Subject: Simplify tests and add tests for db-move

---
 test/runTest | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 76 insertions(+), 10 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 258a181..c53b63c 100755
--- a/test/runTest
+++ b/test/runTest
@@ -103,20 +103,14 @@ testRemovePackages() {
 		done
 	done
 
-	for arch in ${arches[@]}; do
-		[ -z "$(bsdtar -tf "${FTP_BASE}/extra/os/${arch}/extra.db.tar.gz" -O)" ] || fail "extra/os/${arch}/${repo}.db.tar.gz should be empty"
-	done
-
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
-			svn up -q "${TMP}/svn-packages-copy/${pkgbase}"
-			[ -d "${TMP}/svn-packages-copy/${pkgbase}/repos/extra-${arch}" ] && fail "svn-packages-copy/${pkgbase}/repos/extra-${arch} should not exist"
+			checkRemovedPackage extra ${pkgbase} ${arch}
 		done
 	done
 }
 
 testRemoveAnyPackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
@@ -130,15 +124,87 @@ testRemoveAnyPackages() {
 		../db-remove ${pkgbase} extra any
 	done
 
+	for pkgbase in ${pkgs[@]}; do
+		checkRemovedAnyPackage extra ${pkgbase}
+	done
+}
+
+
+#
+# db-move
+#
+
+testMoveSimplePackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-a' 'pkg-simple-b')
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage testing ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update testing
+
+	for arch in ${arches[@]}; do
+		../db-move-draft pkg-simple-a testing extra ${arch}
+	done
+
 	for arch in ${arches[@]}; do
-		[ -z "$(bsdtar -tf "${FTP_BASE}/extra/os/${arch}/extra.db.tar.gz" -O)" ] || fail "extra/os/${arch}/${repo}.db.tar.gz should be empty"
+		checkPackage extra pkg-simple-a-1-1-${arch}.pkg.tar.xz ${arch}
+		checkRemovedPackage testing pkg-simple-a-1-1-${arch}.pkg.tar.xz ${arch}
+
+		checkPackage testing pkg-simple-b-1-1-${arch}.pkg.tar.xz ${arch}
 	done
+}
+
+testMoveAnyPackages() {
+	local pkgs=('pkg-any-a' 'pkg-any-b')
+	local pkgbase
 
 	for pkgbase in ${pkgs[@]}; do
-		svn up -q "${TMP}/svn-packages-copy/${pkgbase}"
-		[ -d "${TMP}/svn-packages-copy/${pkgbase}/repos/extra-any" ] && fail "svn-packages-copy/${pkgbase}/repos/extra-any should not exist"
+		releasePackage testing ${pkgbase} any
 	done
+
+	../db-update testing
+	../db-move-draft pkg-any-a testing extra any
+
+	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz
+	checkRemovedAnyPackage testing pkg-any-a
+	checkAnyPackage testing pkg-any-b-1-1-any.pkg.tar.xz
 }
 
+testMoveSplitPackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-split-a' 'pkg-split-b')
+	local pkg
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage testing ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update testing
+
+	for arch in ${arches[@]}; do
+		../db-move-draft pkg-split-a testing extra ${arch}
+	done
+
+	for arch in ${arches[@]}; do
+		for pkg in "${pkgdir}/pkg-split-a"/*-${arch}.pkg.tar.*; do
+			checkPackage extra $(basename ${pkg}) ${arch}
+		done
+	done
+	for arch in ${arches[@]}; do
+		for pkg in "${pkgdir}/pkg-split-b"/*-${arch}.pkg.tar.*; do
+			checkPackage testing $(basename ${pkg}) ${arch}
+		done
+	done
+
+	checkRemovedAnyPackage testing pkg-split-a
+}
 
 . "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From 0cfcc705c755eda1911a8868b2214c6a56f8e064 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 00:00:34 +0200
Subject: Fix old call

---
 test/runTest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index c53b63c..6a4f3de 100755
--- a/test/runTest
+++ b/test/runTest
@@ -148,7 +148,7 @@ testMoveSimplePackages() {
 	../db-update testing
 
 	for arch in ${arches[@]}; do
-		../db-move-draft pkg-simple-a testing extra ${arch}
+		../db-move pkg-simple-a testing extra ${arch}
 	done
 
 	for arch in ${arches[@]}; do
@@ -168,7 +168,7 @@ testMoveAnyPackages() {
 	done
 
 	../db-update testing
-	../db-move-draft pkg-any-a testing extra any
+	../db-move pkg-any-a testing extra any
 
 	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz
 	checkRemovedAnyPackage testing pkg-any-a
@@ -190,7 +190,7 @@ testMoveSplitPackages() {
 	../db-update testing
 
 	for arch in ${arches[@]}; do
-		../db-move-draft pkg-split-a testing extra ${arch}
+		../db-move pkg-split-a testing extra ${arch}
 	done
 
 	for arch in ${arches[@]}; do
-- 
cgit v1.2.3-2-g168b


From 1db7071b222207d2d924a03a48d0745387f11c7b Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 01:26:11 +0200
Subject: add test for ftpdir-cleanup

---
 test/runTest | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 6a4f3de..7136508 100755
--- a/test/runTest
+++ b/test/runTest
@@ -25,6 +25,7 @@ testAddSimplePackages() {
 	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
+	local arch
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -61,6 +62,7 @@ testAddSplitPackages() {
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
+	local arch
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -88,6 +90,7 @@ testRemovePackages() {
 	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b')
 	local pkgbase
+	local arch
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -138,6 +141,7 @@ testMoveSimplePackages() {
 	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
+	local arch
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -180,6 +184,7 @@ testMoveSplitPackages() {
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
+	local arch
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -207,4 +212,96 @@ testMoveSplitPackages() {
 	checkRemovedAnyPackage testing pkg-split-a
 }
 
+
+#
+# ftpdir-cleanup
+#
+
+testCleanupSimplePackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-a' 'pkg-simple-b')
+	local pkgbase
+	local arch
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update extra
+
+	for arch in ${arches[@]}; do
+		../db-remove pkg-simple-a extra ${arch}
+	done
+
+	../cron-jobs/ftpdir-cleanup
+
+	for arch in ${arches[@]}; do
+		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
+		[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
+		[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
+
+		local pkg2="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
+		checkPackage extra ${pkg2} ${arch}
+	done
+}
+
+testCleanupAnyPackages() {
+	local pkgs=('pkg-any-a' 'pkg-any-b')
+	local pkgbase
+	local arch='any'
+
+	for pkgbase in ${pkgs[@]}; do
+		releasePackage extra ${pkgbase} any
+	done
+
+	../db-update extra
+	../db-remove pkg-any-a extra any
+	../cron-jobs/ftpdir-cleanup
+
+	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
+	[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
+	[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
+
+	local pkg2="pkg-any-b-1-1-${arch}.pkg.tar.xz"
+	checkAnyPackage extra ${pkg2}
+}
+
+testCleanupSplitPackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-split-a' 'pkg-split-b')
+	local pkg
+	local pkgbase
+	local arch
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update extra
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			../db-remove pkg-split-a extra ${arch}
+		done
+	done
+
+	../cron-jobs/ftpdir-cleanup
+
+	for arch in ${arches[@]}; do
+		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
+			[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg}" ] && fail "packages/arch/${arch}/${pkg} found"
+			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
+		done
+
+		for pkg in "${pkgdir}/${pkgs[1]}"/*-${arch}.pkg.tar.*; do
+			checkPackage extra $(basename ${pkg}) ${arch}
+		done
+	done
+}
+
+
 . "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From 918eaba387411a2f447f1669f255bcd2fb681e94 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 02:51:51 +0200
Subject: add transitions tests

Theses tests simulate the case of packages with the old repo layout
and the new package pool layout.
---
 test/runTest | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 7136508..d453493 100755
--- a/test/runTest
+++ b/test/runTest
@@ -303,5 +303,91 @@ testCleanupSplitPackages() {
 	done
 }
 
+#
+# transition tests
+#
+
+testMovePackagesWithoutPool() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b')
+	local pkgbase
+	local arch
+	local pkg
+	local old
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage testing ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update testing
+
+	# transform two packages to old style layout
+	for arch in ${arches[@]}; do
+		for old in 0 2; do
+			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}.pkg.tar.*; do
+				pkg=$(basename $pkg)
+				mv -f "${FTP_BASE}/packages/arch/${arch}/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
+			done
+		done
+	done
+
+	../cron-jobs/ftpdir-cleanup
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			../db-move ${pkgbase} testing extra ${arch}
+		done
+	done
+
+	../cron-jobs/ftpdir-cleanup
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			for pkg in "${pkgdir}/${pkgbase}"/*-${arch}.pkg.tar.*; do
+				checkPackage extra $(basename ${pkg}) ${arch}
+			done
+			checkRemovedPackage testing ${pkgbase} ${arch}
+		done
+	done
+}
+
+testMoveAnyPackagesWithoutPool() {
+	local pkgs=('pkg-any-a' 'pkg-any-b')
+	local pkgbase
+	local arch
+	local pkg
+
+	for pkgbase in ${pkgs[@]}; do
+		releasePackage testing ${pkgbase} any
+	done
+
+	../db-update testing
+
+	# transform a package to old style layout
+	for pkg in "${pkgdir}/${pkgs[0]}"/*-any.pkg.tar.*; do
+		pkg=$(basename $pkg)
+		mv -f "${FTP_BASE}/packages/arch/any/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
+		for arch in i686 x86_64; do
+			ln -sf "../any/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
+		done
+	done
+
+	../cron-jobs/ftpdir-cleanup
+
+	for pkgbase in ${pkgs[@]}; do
+		../db-move ${pkgbase} testing extra any
+	done
+
+	../cron-jobs/ftpdir-cleanup
+
+	for pkgbase in ${pkgs[@]}; do
+		for pkg in "${pkgdir}/${pkgbase}"/*-any.pkg.tar.*; do
+			checkAnyPackage extra $(basename ${pkg})
+		done
+		checkRemovedAnyPackage testing ${pkgbase}
+	done
+}
 
 . "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From c117d9048ae591401a79037222da7bf7bda85705 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 03:44:17 +0200
Subject: Reduce verbosity

Only inform of errors and processes that might take longer.
---
 test/runTest | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index d453493..b24b7ea 100755
--- a/test/runTest
+++ b/test/runTest
@@ -235,7 +235,7 @@ testCleanupSimplePackages() {
 		../db-remove pkg-simple-a extra ${arch}
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
@@ -258,7 +258,7 @@ testCleanupAnyPackages() {
 
 	../db-update extra
 	../db-remove pkg-any-a extra any
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
 	[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
@@ -289,7 +289,7 @@ testCleanupSplitPackages() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
@@ -333,7 +333,7 @@ testMovePackagesWithoutPool() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -341,7 +341,7 @@ testMovePackagesWithoutPool() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -374,13 +374,13 @@ testMoveAnyPackagesWithoutPool() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		../db-move ${pkgbase} testing extra any
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		for pkg in "${pkgdir}/${pkgbase}"/*-any.pkg.tar.*; do
-- 
cgit v1.2.3-2-g168b


From cbe9204ce41a81086c7498360769a66cfe48ce34 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 11:29:16 +0200
Subject: Fix test and add some more checks

---
 test/runTest | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index b24b7ea..5bbea05 100755
--- a/test/runTest
+++ b/test/runTest
@@ -239,6 +239,7 @@ testCleanupSimplePackages() {
 
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
+		checkRemovedPackage extra 'pkg-simple-a' ${arch}
 		[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
 		[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
@@ -261,6 +262,7 @@ testCleanupAnyPackages() {
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
+	checkRemovedAnyPackage extra 'pkg-any-a'
 	[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
 	[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
@@ -283,16 +285,15 @@ testCleanupSplitPackages() {
 
 	../db-update extra
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			../db-remove pkg-split-a extra ${arch}
-		done
+	for arch in ${arches[@]}; do
+		../db-remove ${pkgs[0]} extra ${arch}
 	done
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
+			checkRemovedPackage extra ${pkgs[0]} ${arch}
 			[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg}" ] && fail "packages/arch/${arch}/${pkg} found"
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
 		done
-- 
cgit v1.2.3-2-g168b


From af4f86808e8cd45cc171f55a1ec15bf30d858a0d Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 10 Aug 2010 21:40:24 +0200
Subject: Use more consitent naming for package pool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are no longer architecture-specific subdirs and the structure was switch to this:

ftp
└── pool
    ├── community
    └── packages

packages contains all packages from core, extra and testing; this naming is in sync with the svn repo naming:
svn-packages and svn-community
---
 test/runTest | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 5bbea05..75c7a05 100755
--- a/test/runTest
+++ b/test/runTest
@@ -240,7 +240,7 @@ testCleanupSimplePackages() {
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
 		checkRemovedPackage extra 'pkg-simple-a' ${arch}
-		[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
+		[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" ] && fail "$(get_pkgpool_for_host)/${pkg1} found"
 		[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 		local pkg2="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
@@ -263,7 +263,7 @@ testCleanupAnyPackages() {
 
 	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
 	checkRemovedAnyPackage extra 'pkg-any-a'
-	[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
+	[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" ] && fail "$(get_pkgpool_for_host)/${pkg1} found"
 	[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 	local pkg2="pkg-any-b-1-1-${arch}.pkg.tar.xz"
@@ -294,7 +294,7 @@ testCleanupSplitPackages() {
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
 			checkRemovedPackage extra ${pkgs[0]} ${arch}
-			[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg}" ] && fail "packages/arch/${arch}/${pkg} found"
+			[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" ] && fail "$(get_pkgpool_for_host)/${pkg} found"
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
 		done
 
@@ -329,7 +329,7 @@ testMovePackagesWithoutPool() {
 		for old in 0 2; do
 			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}.pkg.tar.*; do
 				pkg=$(basename $pkg)
-				mv -f "${FTP_BASE}/packages/arch/${arch}/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
+				mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
 			done
 		done
 	done
@@ -369,7 +369,7 @@ testMoveAnyPackagesWithoutPool() {
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/${pkgs[0]}"/*-any.pkg.tar.*; do
 		pkg=$(basename $pkg)
-		mv -f "${FTP_BASE}/packages/arch/any/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
+		mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
 		for arch in i686 x86_64; do
 			ln -sf "../any/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
 		done
-- 
cgit v1.2.3-2-g168b


From cdf17a4c4c83c1363a59fa688654276c3d807eae Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 14 Aug 2010 20:15:50 +0200
Subject: Rewrite of db-update

* db-update now updates all repos with packages in its staging dirs
* sanity checks are performed before any repo is touched
* improved performance
* less code; easier to maintain
---
 test/runTest | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 75c7a05..06ca000 100755
--- a/test/runTest
+++ b/test/runTest
@@ -33,7 +33,7 @@ testAddSimplePackages() {
 		done
 	done
 
-	../db-update extra
+	../db-update
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -50,7 +50,7 @@ testAddAnyPackages() {
 		releasePackage extra ${pkgbase} any
 	done
 
-	../db-update extra
+	../db-update
 
 	for pkgbase in ${pkgs[@]}; do
 		checkAnyPackage extra ${pkgbase}-1-1-any.pkg.tar.xz
@@ -70,7 +70,7 @@ testAddSplitPackages() {
 		done
 	done
 
-	../db-update extra
+	../db-update
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -98,7 +98,7 @@ testRemovePackages() {
 		done
 	done
 
-	../db-update extra
+	../db-update
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -121,7 +121,7 @@ testRemoveAnyPackages() {
 		releasePackage extra ${pkgbase} any
 	done
 
-	../db-update extra
+	../db-update
 
 	for pkgbase in ${pkgs[@]}; do
 		../db-remove ${pkgbase} extra any
@@ -149,7 +149,7 @@ testMoveSimplePackages() {
 		done
 	done
 
-	../db-update testing
+	../db-update
 
 	for arch in ${arches[@]}; do
 		../db-move pkg-simple-a testing extra ${arch}
@@ -171,7 +171,7 @@ testMoveAnyPackages() {
 		releasePackage testing ${pkgbase} any
 	done
 
-	../db-update testing
+	../db-update
 	../db-move pkg-any-a testing extra any
 
 	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz
@@ -192,7 +192,7 @@ testMoveSplitPackages() {
 		done
 	done
 
-	../db-update testing
+	../db-update
 
 	for arch in ${arches[@]}; do
 		../db-move pkg-split-a testing extra ${arch}
@@ -229,7 +229,7 @@ testCleanupSimplePackages() {
 		done
 	done
 
-	../db-update extra
+	../db-update
 
 	for arch in ${arches[@]}; do
 		../db-remove pkg-simple-a extra ${arch}
@@ -257,7 +257,7 @@ testCleanupAnyPackages() {
 		releasePackage extra ${pkgbase} any
 	done
 
-	../db-update extra
+	../db-update
 	../db-remove pkg-any-a extra any
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
@@ -283,7 +283,7 @@ testCleanupSplitPackages() {
 		done
 	done
 
-	../db-update extra
+	../db-update
 
 	for arch in ${arches[@]}; do
 		../db-remove ${pkgs[0]} extra ${arch}
@@ -322,7 +322,7 @@ testMovePackagesWithoutPool() {
 		done
 	done
 
-	../db-update testing
+	../db-update
 
 	# transform two packages to old style layout
 	for arch in ${arches[@]}; do
@@ -364,7 +364,7 @@ testMoveAnyPackagesWithoutPool() {
 		releasePackage testing ${pkgbase} any
 	done
 
-	../db-update testing
+	../db-update
 
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/${pkgs[0]}"/*-any.pkg.tar.*; do
-- 
cgit v1.2.3-2-g168b


From 55aa721771c7486c447b270325c504724622fd00 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 14 Aug 2010 22:41:16 +0200
Subject: Prepare support for multiple packages in db-move

---
 test/runTest | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 06ca000..8c1aa04 100755
--- a/test/runTest
+++ b/test/runTest
@@ -152,7 +152,7 @@ testMoveSimplePackages() {
 	../db-update
 
 	for arch in ${arches[@]}; do
-		../db-move pkg-simple-a testing extra ${arch}
+		../db-move testing extra ${arch} pkg-simple-a
 	done
 
 	for arch in ${arches[@]}; do
@@ -172,7 +172,7 @@ testMoveAnyPackages() {
 	done
 
 	../db-update
-	../db-move pkg-any-a testing extra any
+	../db-move testing extra any pkg-any-a
 
 	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz
 	checkRemovedAnyPackage testing pkg-any-a
@@ -195,7 +195,7 @@ testMoveSplitPackages() {
 	../db-update
 
 	for arch in ${arches[@]}; do
-		../db-move pkg-split-a testing extra ${arch}
+		../db-move testing extra ${arch} pkg-split-a
 	done
 
 	for arch in ${arches[@]}; do
@@ -338,7 +338,7 @@ testMovePackagesWithoutPool() {
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
-			../db-move ${pkgbase} testing extra ${arch}
+			../db-move testing extra ${arch} ${pkgbase}
 		done
 	done
 
@@ -378,7 +378,7 @@ testMoveAnyPackagesWithoutPool() {
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
-		../db-move ${pkgbase} testing extra any
+		../db-move testing extra any ${pkgbase}
 	done
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
-- 
cgit v1.2.3-2-g168b


From 79db58732efbab54911ccbbb8cd876da29ea48c8 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 15 Aug 2010 18:21:33 +0200
Subject: Move packages of all arches within one transaction

db-move does no longer need a specific architecture. It will move all architecures of a given package
at once.

testing2x has been rewritten to respect these changes and testing2x64 is no longer needed.
---
 test/runTest | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 8c1aa04..03f94c2 100755
--- a/test/runTest
+++ b/test/runTest
@@ -151,9 +151,7 @@ testMoveSimplePackages() {
 
 	../db-update
 
-	for arch in ${arches[@]}; do
-		../db-move testing extra ${arch} pkg-simple-a
-	done
+	../db-move testing extra pkg-simple-a
 
 	for arch in ${arches[@]}; do
 		checkPackage extra pkg-simple-a-1-1-${arch}.pkg.tar.xz ${arch}
@@ -172,7 +170,7 @@ testMoveAnyPackages() {
 	done
 
 	../db-update
-	../db-move testing extra any pkg-any-a
+	../db-move testing extra pkg-any-a
 
 	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz
 	checkRemovedAnyPackage testing pkg-any-a
@@ -193,10 +191,7 @@ testMoveSplitPackages() {
 	done
 
 	../db-update
-
-	for arch in ${arches[@]}; do
-		../db-move testing extra ${arch} pkg-split-a
-	done
+	../db-move testing extra pkg-split-a
 
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/pkg-split-a"/*-${arch}.pkg.tar.*; do
@@ -336,11 +331,7 @@ testMovePackagesWithoutPool() {
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			../db-move testing extra ${arch} ${pkgbase}
-		done
-	done
+	../db-move testing extra ${pkgs[@]}
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
@@ -377,9 +368,7 @@ testMoveAnyPackagesWithoutPool() {
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
-	for pkgbase in ${pkgs[@]}; do
-		../db-move testing extra any ${pkgbase}
-	done
+	../db-move testing extra ${pkgs[@]}
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
-- 
cgit v1.2.3-2-g168b


From ce604bc3a2569198fa749acca190fef036e059a1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 15 Aug 2010 19:17:05 +0200
Subject: add test to check updating a package

---
 test/runTest | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 03f94c2..a16165d 100755
--- a/test/runTest
+++ b/test/runTest
@@ -81,6 +81,24 @@ testAddSplitPackages() {
 	done
 }
 
+testUpdateAnyPackage() {
+	releasePackage extra pkg-any-a any
+	../db-update
+
+	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
+	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
+	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
+	popd >/dev/null
+
+	releasePackage extra pkg-any-a any
+	../db-update
+
+	checkAnyPackage extra pkg-any-a-1-2-any.pkg.tar.xz any
+
+	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
+}
 
 #
 # db-remove
-- 
cgit v1.2.3-2-g168b


From 583863043ad11eb203c479c9d0eea825a29ace39 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 15 Aug 2010 19:21:38 +0200
Subject: add test for testing2x

---
 test/runTest | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index a16165d..95d8c6c 100755
--- a/test/runTest
+++ b/test/runTest
@@ -226,6 +226,32 @@ testMoveSplitPackages() {
 }
 
 
+#
+# testing2x
+#
+
+testTesting2xAnyPackage() {
+	releasePackage core pkg-any-a any
+	../db-update
+
+	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
+	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
+	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
+	popd >/dev/null
+
+	releasePackage testing pkg-any-a any
+	../db-update
+	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
+
+	../testing2x pkg-any-a
+
+	checkAnyPackage core pkg-any-a-1-2-any.pkg.tar.xz any
+	checkRemovedAnyPackage testing pkg-any-a
+}
+
+
 #
 # ftpdir-cleanup
 #
-- 
cgit v1.2.3-2-g168b


From cb39feaff074c5e08ff2dfce8dfa04c545233b7e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 17 Aug 2010 16:41:31 +0200
Subject: Don't try to update no package

Check if there are packages to update for given architecure. Previously
db-update quit when only one arch of a package was available.
---
 test/runTest | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 95d8c6c..72f9b1c 100755
--- a/test/runTest
+++ b/test/runTest
@@ -42,6 +42,12 @@ testAddSimplePackages() {
 	done
 }
 
+testAddSingleSimplePackage() {
+	releasePackage extra 'pkg-simple-a' 'i686'
+	../db-update
+	checkPackage extra 'pkg-simple-a-1-1-i686.pkg.tar.xz' 'i686'
+}
+
 testAddAnyPackages() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
-- 
cgit v1.2.3-2-g168b


From 8647de4f52e05eadc0a4832813e9a57c20a487dd Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 18 Aug 2010 11:58:02 +0200
Subject: Fix cleanup of old packages

* This should fix the cleanup of packages that were not within the pacakge pool before being updated.
* a test case for this was added
---
 test/runTest | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 72f9b1c..cfc4ee6 100755
--- a/test/runTest
+++ b/test/runTest
@@ -395,6 +395,42 @@ testMovePackagesWithoutPool() {
 	done
 }
 
+testUpdateAnyPackageWithoutPool() {
+	local pkgname='pkg-any-a'
+	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
+	local pkg2='pkg-any-a-1-2-any.pkg.tar.xz'
+	local arch
+
+
+	releasePackage extra pkg-any-a any
+	../db-update
+	# transform two packages to old style layout
+	mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" "${FTP_BASE}/extra/os/any"
+	for arch in i686 x86_64; do
+		ln -sf "../any/${pkg1}" "${FTP_BASE}/extra/os/${arch}"
+	done
+
+	pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null
+	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
+	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	mv "${pkg2}" "${pkgdir}/${pkgname}/"
+	popd >/dev/null
+
+	releasePackage extra ${pkgname} any
+	../db-update
+	rm "${pkgdir}/${pkgname}/${pkg2}"
+
+	../cron-jobs/ftpdir-cleanup >/dev/null
+
+	checkAnyPackage extra "${pkg2}"
+
+	[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" ] && fail "$(get_pkgpool_for_host)/${pkg1} found"
+	for arch in any i686 x86_64; do
+		[ -f "${FTP_BASE}/extra/os/${arch}/${pkg1}" ] && fail "extra/os/${arch}/${pkg1} found"
+	done
+}
+
 testMoveAnyPackagesWithoutPool() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
@@ -428,6 +464,13 @@ testMoveAnyPackagesWithoutPool() {
 		done
 		checkRemovedAnyPackage testing ${pkgbase}
 	done
+
+	for pkg in "${pkgdir}/${pkgs[0]}"/*-any.pkg.tar.*; do
+		pkg=$(basename $pkg)
+		for arch in any i686 x86_64; do
+			[ -f "${FTP_BASE}/testing/os/${arch}/${pkg}" ] && fail "testing/os/${arch}/${pkg} found"
+		done
+	done
 }
 
 . "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From cca13c2b41ba1389ce4187a728e05a376ad3ad0d Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 5 Sep 2010 12:54:37 +0200
Subject: Fix updating of same package into different repositories at aonce

See FS#20745
---
 test/runTest | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index cfc4ee6..e254de0 100755
--- a/test/runTest
+++ b/test/runTest
@@ -106,6 +106,26 @@ testUpdateAnyPackage() {
 	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
 }
 
+testUpdateAnyPackageInDifferentRepositoriesAtOnce() {
+	releasePackage extra pkg-any-a any
+
+	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
+	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
+	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
+	popd >/dev/null
+
+	releasePackage testing pkg-any-a any
+
+	../db-update
+
+	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz any
+	checkAnyPackage testing pkg-any-a-1-2-any.pkg.tar.xz any
+
+	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
+}
+
 #
 # db-remove
 #
-- 
cgit v1.2.3-2-g168b


From 6f29ee2f02c2a8e2991599ce1d76a59b58a7ee67 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 5 Sep 2010 13:32:27 +0200
Subject: Check if package exists in any other repository on update

This also checks if the sam package exists within the old package
layout (without package pool)
---
 test/runTest | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index e254de0..b07b099 100755
--- a/test/runTest
+++ b/test/runTest
@@ -106,7 +106,7 @@ testUpdateAnyPackage() {
 	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
 }
 
-testUpdateAnyPackageInDifferentRepositoriesAtOnce() {
+testUpdateAnyPackageToDifferentRepositoriesAtOnce() {
 	releasePackage extra pkg-any-a any
 
 	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
@@ -126,6 +126,22 @@ testUpdateAnyPackageInDifferentRepositoriesAtOnce() {
 	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
 }
 
+testUpdateSameAnyPackageToDifferentRepositories() {
+	releasePackage extra pkg-any-a any
+	../db-update
+	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz any
+
+	releasePackage testing pkg-any-a any
+	../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1)
+
+	local arch
+	for arch in i686 x86_64; do
+		( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" ] \
+			&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" -O | grep -q ${pkgbase}) \
+			&& fail "${pkgbase} should not be in ${repo}/os/${arch}/${repo}${DBEXT%.tar.*}"
+	done
+}
+
 #
 # db-remove
 #
@@ -493,4 +509,31 @@ testMoveAnyPackagesWithoutPool() {
 	done
 }
 
+testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
+	local pkg
+	local arch
+
+	releasePackage extra pkg-any-a any
+	../db-update
+
+	# transform a package to old style layout
+	for pkg in "${pkgdir}/pkg-any-a"/*-any.pkg.tar.*; do
+		pkg=$(basename $pkg)
+		mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" "${FTP_BASE}/extra/os/any/${pkg}"
+		for arch in i686 x86_64; do
+			ln -sf "../any/${pkg}" "${FTP_BASE}/extra/os/${arch}/${pkg}"
+		done
+	done
+
+	releasePackage testing pkg-any-a any
+	../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1)
+
+	for arch in i686 x86_64; do
+		( [ -r "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \
+			&& bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep -q pkg-any-a) \
+			&& fail "pkg-any-a should not be in testing/os/${arch}/testing${DBEXT%.tar.*}"
+	done
+}
+
+
 . "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From f121126f8166fb6dc261ea82f2890ba6693d047e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 11 Sep 2010 22:52:23 +0200
Subject: Use local config instead of guessing by hostname

Using the hostname to decide which repos to use is not releiable and hard to test.
Instead use config.local to configure these.

config files for sigurd and gerolde were added which can be copied or symlinked to config.local
on the specific host.
---
 test/runTest | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index b07b099..4681944 100755
--- a/test/runTest
+++ b/test/runTest
@@ -321,7 +321,7 @@ testCleanupSimplePackages() {
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
 		checkRemovedPackage extra 'pkg-simple-a' ${arch}
-		[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" ] && fail "$(get_pkgpool_for_host)/${pkg1} found"
+		[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
 		[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 		local pkg2="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
@@ -344,7 +344,7 @@ testCleanupAnyPackages() {
 
 	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
 	checkRemovedAnyPackage extra 'pkg-any-a'
-	[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" ] && fail "$(get_pkgpool_for_host)/${pkg1} found"
+	[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
 	[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 	local pkg2="pkg-any-b-1-1-${arch}.pkg.tar.xz"
@@ -375,7 +375,7 @@ testCleanupSplitPackages() {
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
 			checkRemovedPackage extra ${pkgs[0]} ${arch}
-			[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" ] && fail "$(get_pkgpool_for_host)/${pkg} found"
+			[ -f "${FTP_BASE}/${PKGPOOL}/${pkg}" ] && fail "${PKGPOOL}/${pkg} found"
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
 		done
 
@@ -410,7 +410,7 @@ testMovePackagesWithoutPool() {
 		for old in 0 2; do
 			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}.pkg.tar.*; do
 				pkg=$(basename $pkg)
-				mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
+				mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
 			done
 		done
 	done
@@ -441,7 +441,7 @@ testUpdateAnyPackageWithoutPool() {
 	releasePackage extra pkg-any-a any
 	../db-update
 	# transform two packages to old style layout
-	mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" "${FTP_BASE}/extra/os/any"
+	mv -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" "${FTP_BASE}/extra/os/any"
 	for arch in i686 x86_64; do
 		ln -sf "../any/${pkg1}" "${FTP_BASE}/extra/os/${arch}"
 	done
@@ -461,7 +461,7 @@ testUpdateAnyPackageWithoutPool() {
 
 	checkAnyPackage extra "${pkg2}"
 
-	[ -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg1}" ] && fail "$(get_pkgpool_for_host)/${pkg1} found"
+	[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
 	for arch in any i686 x86_64; do
 		[ -f "${FTP_BASE}/extra/os/${arch}/${pkg1}" ] && fail "extra/os/${arch}/${pkg1} found"
 	done
@@ -482,7 +482,7 @@ testMoveAnyPackagesWithoutPool() {
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/${pkgs[0]}"/*-any.pkg.tar.*; do
 		pkg=$(basename $pkg)
-		mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
+		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
 		for arch in i686 x86_64; do
 			ln -sf "../any/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
 		done
@@ -519,7 +519,7 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/pkg-any-a"/*-any.pkg.tar.*; do
 		pkg=$(basename $pkg)
-		mv -f "${FTP_BASE}/$(get_pkgpool_for_host)/${pkg}" "${FTP_BASE}/extra/os/any/${pkg}"
+		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/extra/os/any/${pkg}"
 		for arch in i686 x86_64; do
 			ln -sf "../any/${pkg}" "${FTP_BASE}/extra/os/${arch}/${pkg}"
 		done
-- 
cgit v1.2.3-2-g168b


From cb2dcc6ee207e9c5ba4b875d70e387e6347591ed Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 20 Nov 2010 16:11:59 +0100
Subject: Fix sourceballs cron job

* add unit test for sourceballs and cleanup
* introduce SRCPOOL and LOGDIR variables in config
---
 test/runTest | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 4681944..d3e2eff 100755
--- a/test/runTest
+++ b/test/runTest
@@ -535,5 +535,64 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
 	done
 }
 
+#
+#sourceballs tests
+#
+
+testSourceballs() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-a' 'pkg-simple-b')
+	local pkgbase
+	local arch
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+	../db-update
+
+	../cron-jobs/sourceballs
+
+	for log in errors failed; do
+		if [ -s "${LOGDIR}/sourceballs/${log}.txt" ]; then
+			fail "${LOGDIR}/sourceballs/${log}.txt includes the following errors:"
+			cat "${LOGDIR}/sourceballs/${log}.txt"
+		fi
+	done
+	for pkgbase in ${pkgs[@]}; do
+		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
+	done
+}
+
+testSourceballsCleanup() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-a' 'pkg-simple-b')
+	local pkgbase
+	local arch
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+	../db-update
+	../cron-jobs/sourceballs
+
+	for arch in ${arches[@]}; do
+		../db-remove pkg-simple-a extra ${arch}
+	done
+	../cron-jobs/ftpdir-cleanup >/dev/null
+
+	../cron-jobs/sourceballs
+	for log in errors failed; do
+		if [ -s "${LOGDIR}/sourceballs/${log}.txt" ]; then
+			fail "${LOGDIR}/sourceballs/${log}.txt includes the following errors:"
+			cat "${LOGDIR}/sourceballs/${log}.txt"
+		fi
+	done
+	[ -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-a-*${SRCEXT} ] && fail "source package was not removed!"
+	[ ! -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-b-*${SRCEXT} ] && fail "source package not found!"
+}
 
 . "${curdir}/lib/shunit2"
-- 
cgit v1.2.3-2-g168b


From 30a128a864bdbfc294b6ba6a49c9264570bb3c58 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 21 Nov 2010 13:23:09 +0100
Subject: sourceballs: Don't write any log

This is consistent with the other dbscripts.
The output will be send to the mailinglist.
---
 test/runTest | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index d3e2eff..6c60ddc 100755
--- a/test/runTest
+++ b/test/runTest
@@ -553,13 +553,6 @@ testSourceballs() {
 	../db-update
 
 	../cron-jobs/sourceballs
-
-	for log in errors failed; do
-		if [ -s "${LOGDIR}/sourceballs/${log}.txt" ]; then
-			fail "${LOGDIR}/sourceballs/${log}.txt includes the following errors:"
-			cat "${LOGDIR}/sourceballs/${log}.txt"
-		fi
-	done
 	for pkgbase in ${pkgs[@]}; do
 		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
 	done
@@ -585,12 +578,6 @@ testSourceballsCleanup() {
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	../cron-jobs/sourceballs
-	for log in errors failed; do
-		if [ -s "${LOGDIR}/sourceballs/${log}.txt" ]; then
-			fail "${LOGDIR}/sourceballs/${log}.txt includes the following errors:"
-			cat "${LOGDIR}/sourceballs/${log}.txt"
-		fi
-	done
 	[ -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-a-*${SRCEXT} ] && fail "source package was not removed!"
 	[ ! -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-b-*${SRCEXT} ] && fail "source package not found!"
 }
-- 
cgit v1.2.3-2-g168b


From cf642f924a4404f85926619324e59b3c878c1284 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 21 Nov 2010 13:59:30 +0100
Subject: sourceballs: Support any packages

---
 test/runTest | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 6c60ddc..fe22ce7 100755
--- a/test/runTest
+++ b/test/runTest
@@ -558,6 +558,21 @@ testSourceballs() {
 	done
 }
 
+testAnySourceballs() {
+	local pkgs=('pkg-any-a' 'pkg-any-b')
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		releasePackage extra ${pkgbase} any
+	done
+	../db-update
+
+	../cron-jobs/sourceballs
+	for pkgbase in ${pkgs[@]}; do
+		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
+	done
+}
+
 testSourceballsCleanup() {
 	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-- 
cgit v1.2.3-2-g168b


From 5869af885163b763abb204dff2cc847556fb247b Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 22 Nov 2010 14:35:30 +0100
Subject: sourceballs: add for split packages

---
 test/runTest | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index fe22ce7..f438704 100755
--- a/test/runTest
+++ b/test/runTest
@@ -573,6 +573,27 @@ testAnySourceballs() {
 	done
 }
 
+testSplitSourceballs() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-split-a' 'pkg-split-b')
+	local pkg
+	local pkgbase
+	local arch
+
+	for pkgbase in ${pkgs[@]}; do
+		for arch in ${arches[@]}; do
+			releasePackage extra ${pkgbase} ${arch}
+		done
+	done
+
+	../db-update
+
+	../cron-jobs/sourceballs
+	for pkgbase in ${pkgs[@]}; do
+		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
+	done
+}
+
 testSourceballsCleanup() {
 	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-- 
cgit v1.2.3-2-g168b


From 5f72b8029c07f3357014d8716f18f21ce649c98a Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 25 Nov 2010 06:55:03 +0100
Subject: Provide more real test packages

* Use devtools instead of plain makepkg
* This is a preparation for some more advanced test cases.
---
 test/runTest | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index f438704..0fcdf18 100755
--- a/test/runTest
+++ b/test/runTest
@@ -8,12 +8,8 @@ curdir=$(readlink -e $(dirname $0))
 #
 
 testPackages() {
-	local p
-	for p in "${pkgdir}"/*; do
-		pushd $p >/dev/null
-		namcap *.pkg.tar.* || fail 'namcap failed'
-		popd >/dev/null
-	done
+	# TODO: namcap -r depends fails with i686 packages
+	find "${pkgdir}" -name "*${PKGEXT}" -exec namcap -e depends {} + || fail 'namcap failed'
 }
 
 
@@ -94,7 +90,7 @@ testUpdateAnyPackage() {
 	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
 	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
 	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	extra-i686-build >/dev/null 2>&1
 	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
 	popd >/dev/null
 
@@ -103,7 +99,7 @@ testUpdateAnyPackage() {
 
 	checkAnyPackage extra pkg-any-a-1-2-any.pkg.tar.xz any
 
-	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
+	rm -f "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
 }
 
 testUpdateAnyPackageToDifferentRepositoriesAtOnce() {
@@ -112,7 +108,7 @@ testUpdateAnyPackageToDifferentRepositoriesAtOnce() {
 	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
 	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
 	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	extra-i686-build >/dev/null 2>&1
 	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
 	popd >/dev/null
 
@@ -123,7 +119,7 @@ testUpdateAnyPackageToDifferentRepositoriesAtOnce() {
 	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz any
 	checkAnyPackage testing pkg-any-a-1-2-any.pkg.tar.xz any
 
-	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
+	rm -f "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
 }
 
 testUpdateSameAnyPackageToDifferentRepositories() {
@@ -279,13 +275,13 @@ testTesting2xAnyPackage() {
 	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
 	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
 	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	extra-i686-build >/dev/null 2>&1
 	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
 	popd >/dev/null
 
 	releasePackage testing pkg-any-a any
 	../db-update
-	rm "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
+	rm -f "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
 
 	../testing2x pkg-any-a
 
@@ -449,13 +445,13 @@ testUpdateAnyPackageWithoutPool() {
 	pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null
 	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
 	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	makepkg -cf --config ${curdir}/lib/makepkg-i686.conf >/dev/null 2>&1
+	extra-i686-build >/dev/null 2>&1
 	mv "${pkg2}" "${pkgdir}/${pkgname}/"
 	popd >/dev/null
 
 	releasePackage extra ${pkgname} any
 	../db-update
-	rm "${pkgdir}/${pkgname}/${pkg2}"
+	rm -f "${pkgdir}/${pkgname}/${pkg2}"
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
-- 
cgit v1.2.3-2-g168b


From 793d78130ba808ee688c8b7139a2bc6180b29534 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 25 Nov 2010 08:18:26 +0100
Subject: Split tests into several files

* tests can be run seperatly
* runTest will run all tests that have the x bit set
---
 test/runTest | 628 ++---------------------------------------------------------
 1 file changed, 13 insertions(+), 615 deletions(-)

(limited to 'test/runTest')

diff --git a/test/runTest b/test/runTest
index 0fcdf18..b8713d8 100755
--- a/test/runTest
+++ b/test/runTest
@@ -1,617 +1,15 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
-. "${curdir}/lib/common.inc"
-
-#
-# self test
-#
-
-testPackages() {
-	# TODO: namcap -r depends fails with i686 packages
-	find "${pkgdir}" -name "*${PKGEXT}" -exec namcap -e depends {} + || fail 'namcap failed'
-}
-
-
-#
-# db-update
-#
-
-testAddSimplePackages() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkPackage extra ${pkgbase}-1-1-${arch}.pkg.tar.xz ${arch}
-		done
-	done
-}
-
-testAddSingleSimplePackage() {
-	releasePackage extra 'pkg-simple-a' 'i686'
-	../db-update
-	checkPackage extra 'pkg-simple-a-1-1-i686.pkg.tar.xz' 'i686'
-}
-
-testAddAnyPackages() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
-	done
-
-	../db-update
-
-	for pkgbase in ${pkgs[@]}; do
-		checkAnyPackage extra ${pkgbase}-1-1-any.pkg.tar.xz
-	done
-}
-
-testAddSplitPackages() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-split-a' 'pkg-split-b')
-	local pkg
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			for pkg in "${pkgdir}/${pkgbase}"/*-${arch}.pkg.tar.*; do
-				checkPackage extra $(basename ${pkg}) ${arch}
-			done
-		done
-	done
-}
-
-testUpdateAnyPackage() {
-	releasePackage extra pkg-any-a any
-	../db-update
-
-	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
-	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	extra-i686-build >/dev/null 2>&1
-	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
-	popd >/dev/null
-
-	releasePackage extra pkg-any-a any
-	../db-update
-
-	checkAnyPackage extra pkg-any-a-1-2-any.pkg.tar.xz any
-
-	rm -f "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
-}
-
-testUpdateAnyPackageToDifferentRepositoriesAtOnce() {
-	releasePackage extra pkg-any-a any
-
-	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
-	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	extra-i686-build >/dev/null 2>&1
-	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
-	popd >/dev/null
-
-	releasePackage testing pkg-any-a any
-
-	../db-update
-
-	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz any
-	checkAnyPackage testing pkg-any-a-1-2-any.pkg.tar.xz any
-
-	rm -f "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
-}
-
-testUpdateSameAnyPackageToDifferentRepositories() {
-	releasePackage extra pkg-any-a any
-	../db-update
-	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz any
-
-	releasePackage testing pkg-any-a any
-	../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1)
-
-	local arch
-	for arch in i686 x86_64; do
-		( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" ] \
-			&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" -O | grep -q ${pkgbase}) \
-			&& fail "${pkgbase} should not be in ${repo}/os/${arch}/${repo}${DBEXT%.tar.*}"
-	done
-}
-
-#
-# db-remove
-#
-
-testRemovePackages() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b')
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			../db-remove ${pkgbase} extra ${arch}
-		done
-	done
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkRemovedPackage extra ${pkgbase} ${arch}
-		done
-	done
-}
-
-testRemoveAnyPackages() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
-	done
-
-	../db-update
-
-	for pkgbase in ${pkgs[@]}; do
-		../db-remove ${pkgbase} extra any
-	done
-
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedAnyPackage extra ${pkgbase}
-	done
-}
-
-
-#
-# db-move
-#
-
-testMoveSimplePackages() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage testing ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	../db-move testing extra pkg-simple-a
-
-	for arch in ${arches[@]}; do
-		checkPackage extra pkg-simple-a-1-1-${arch}.pkg.tar.xz ${arch}
-		checkRemovedPackage testing pkg-simple-a-1-1-${arch}.pkg.tar.xz ${arch}
-
-		checkPackage testing pkg-simple-b-1-1-${arch}.pkg.tar.xz ${arch}
-	done
-}
-
-testMoveAnyPackages() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase} any
-	done
-
-	../db-update
-	../db-move testing extra pkg-any-a
-
-	checkAnyPackage extra pkg-any-a-1-1-any.pkg.tar.xz
-	checkRemovedAnyPackage testing pkg-any-a
-	checkAnyPackage testing pkg-any-b-1-1-any.pkg.tar.xz
-}
-
-testMoveSplitPackages() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-split-a' 'pkg-split-b')
-	local pkg
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage testing ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-	../db-move testing extra pkg-split-a
-
-	for arch in ${arches[@]}; do
-		for pkg in "${pkgdir}/pkg-split-a"/*-${arch}.pkg.tar.*; do
-			checkPackage extra $(basename ${pkg}) ${arch}
-		done
-	done
-	for arch in ${arches[@]}; do
-		for pkg in "${pkgdir}/pkg-split-b"/*-${arch}.pkg.tar.*; do
-			checkPackage testing $(basename ${pkg}) ${arch}
-		done
-	done
-
-	checkRemovedAnyPackage testing pkg-split-a
-}
-
-
-#
-# testing2x
-#
-
-testTesting2xAnyPackage() {
-	releasePackage core pkg-any-a any
-	../db-update
-
-	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
-	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	extra-i686-build >/dev/null 2>&1
-	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
-	popd >/dev/null
-
-	releasePackage testing pkg-any-a any
-	../db-update
-	rm -f "${pkgdir}/pkg-any-a/pkg-any-a-1-2-any.pkg.tar.xz"
-
-	../testing2x pkg-any-a
-
-	checkAnyPackage core pkg-any-a-1-2-any.pkg.tar.xz any
-	checkRemovedAnyPackage testing pkg-any-a
-}
-
-
-#
-# ftpdir-cleanup
-#
-
-testCleanupSimplePackages() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	for arch in ${arches[@]}; do
-		../db-remove pkg-simple-a extra ${arch}
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for arch in ${arches[@]}; do
-		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
-		checkRemovedPackage extra 'pkg-simple-a' ${arch}
-		[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
-		[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
-
-		local pkg2="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
-		checkPackage extra ${pkg2} ${arch}
-	done
-}
-
-testCleanupAnyPackages() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-	local arch='any'
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
-	done
-
-	../db-update
-	../db-remove pkg-any-a extra any
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
-	checkRemovedAnyPackage extra 'pkg-any-a'
-	[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
-	[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
-
-	local pkg2="pkg-any-b-1-1-${arch}.pkg.tar.xz"
-	checkAnyPackage extra ${pkg2}
-}
-
-testCleanupSplitPackages() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-split-a' 'pkg-split-b')
-	local pkg
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	for arch in ${arches[@]}; do
-		../db-remove ${pkgs[0]} extra ${arch}
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for arch in ${arches[@]}; do
-		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
-			checkRemovedPackage extra ${pkgs[0]} ${arch}
-			[ -f "${FTP_BASE}/${PKGPOOL}/${pkg}" ] && fail "${PKGPOOL}/${pkg} found"
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
-		done
-
-		for pkg in "${pkgdir}/${pkgs[1]}"/*-${arch}.pkg.tar.*; do
-			checkPackage extra $(basename ${pkg}) ${arch}
-		done
-	done
-}
-
-#
-# transition tests
-#
-
-testMovePackagesWithoutPool() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b')
-	local pkgbase
-	local arch
-	local pkg
-	local old
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage testing ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	# transform two packages to old style layout
-	for arch in ${arches[@]}; do
-		for old in 0 2; do
-			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}.pkg.tar.*; do
-				pkg=$(basename $pkg)
-				mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
-			done
-		done
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	../db-move testing extra ${pkgs[@]}
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			for pkg in "${pkgdir}/${pkgbase}"/*-${arch}.pkg.tar.*; do
-				checkPackage extra $(basename ${pkg}) ${arch}
-			done
-			checkRemovedPackage testing ${pkgbase} ${arch}
-		done
-	done
-}
-
-testUpdateAnyPackageWithoutPool() {
-	local pkgname='pkg-any-a'
-	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
-	local pkg2='pkg-any-a-1-2-any.pkg.tar.xz'
-	local arch
-
-
-	releasePackage extra pkg-any-a any
-	../db-update
-	# transform two packages to old style layout
-	mv -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" "${FTP_BASE}/extra/os/any"
-	for arch in i686 x86_64; do
-		ln -sf "../any/${pkg1}" "${FTP_BASE}/extra/os/${arch}"
-	done
-
-	pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null
-	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	extra-i686-build >/dev/null 2>&1
-	mv "${pkg2}" "${pkgdir}/${pkgname}/"
-	popd >/dev/null
-
-	releasePackage extra ${pkgname} any
-	../db-update
-	rm -f "${pkgdir}/${pkgname}/${pkg2}"
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	checkAnyPackage extra "${pkg2}"
-
-	[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
-	for arch in any i686 x86_64; do
-		[ -f "${FTP_BASE}/extra/os/${arch}/${pkg1}" ] && fail "extra/os/${arch}/${pkg1} found"
-	done
-}
-
-testMoveAnyPackagesWithoutPool() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-	local arch
-	local pkg
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase} any
-	done
-
-	../db-update
-
-	# transform a package to old style layout
-	for pkg in "${pkgdir}/${pkgs[0]}"/*-any.pkg.tar.*; do
-		pkg=$(basename $pkg)
-		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
-		for arch in i686 x86_64; do
-			ln -sf "../any/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
-		done
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	../db-move testing extra ${pkgs[@]}
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for pkgbase in ${pkgs[@]}; do
-		for pkg in "${pkgdir}/${pkgbase}"/*-any.pkg.tar.*; do
-			checkAnyPackage extra $(basename ${pkg})
-		done
-		checkRemovedAnyPackage testing ${pkgbase}
-	done
-
-	for pkg in "${pkgdir}/${pkgs[0]}"/*-any.pkg.tar.*; do
-		pkg=$(basename $pkg)
-		for arch in any i686 x86_64; do
-			[ -f "${FTP_BASE}/testing/os/${arch}/${pkg}" ] && fail "testing/os/${arch}/${pkg} found"
-		done
-	done
-}
-
-testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
-	local pkg
-	local arch
-
-	releasePackage extra pkg-any-a any
-	../db-update
-
-	# transform a package to old style layout
-	for pkg in "${pkgdir}/pkg-any-a"/*-any.pkg.tar.*; do
-		pkg=$(basename $pkg)
-		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/extra/os/any/${pkg}"
-		for arch in i686 x86_64; do
-			ln -sf "../any/${pkg}" "${FTP_BASE}/extra/os/${arch}/${pkg}"
-		done
-	done
-
-	releasePackage testing pkg-any-a any
-	../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1)
-
-	for arch in i686 x86_64; do
-		( [ -r "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \
-			&& bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep -q pkg-any-a) \
-			&& fail "pkg-any-a should not be in testing/os/${arch}/testing${DBEXT%.tar.*}"
-	done
-}
-
-#
-#sourceballs tests
-#
-
-testSourceballs() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-	../db-update
-
-	../cron-jobs/sourceballs
-	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
-	done
-}
-
-testAnySourceballs() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
-	done
-	../db-update
-
-	../cron-jobs/sourceballs
-	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
-	done
-}
-
-testSplitSourceballs() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-split-a' 'pkg-split-b')
-	local pkg
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	../cron-jobs/sourceballs
-	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
-	done
-}
-
-testSourceballsCleanup() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-	local pkgbase
-	local arch
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
-		done
-	done
-	../db-update
-	../cron-jobs/sourceballs
-
-	for arch in ${arches[@]}; do
-		../db-remove pkg-simple-a extra ${arch}
-	done
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	../cron-jobs/sourceballs
-	[ -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-a-*${SRCEXT} ] && fail "source package was not removed!"
-	[ ! -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-b-*${SRCEXT} ] && fail "source package not found!"
-}
-
-. "${curdir}/lib/shunit2"
+. "$(dirname ${BASH_SOURCE[0]})/lib/common.inc"
+
+for t in "$(dirname ${BASH_SOURCE[0]})/test.d/"*.sh; do
+	l=$(basename ${t} .sh)
+	if [ -x ${t} ]; then
+		msg "Running test '${l}'"
+		${t}
+		[ $? -ne 0 ] && die "Test '${l}' failed"
+		echo -e "\n\n\n"
+	else
+		warning "Skipping test ${l}"
+	fi
+done
-- 
cgit v1.2.3-2-g168b