Merge branch 'master' of https://projects.archlinux.org/git/dbscripts

Conflicts:
	db-functions

1 files changed, 24 insertions, 2 deletions

diff --git a/test/test.d/db-move.sh b/test/test.d/db-move.sh
index 57cbf71..40b40de 100755
--- a/test/test.d/db-move.sh
+++ b/test/test.d/db-move.sh
@@ -27,6 +27,28 @@ testMoveSimplePackages() {
 	done
 }
 
+testMoveEpochPackages() {
+	local arches=('i686' 'x86_64')
+	local pkgs=('pkg-simple-epoch')
+	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-epoch
+
+	for arch in ${arches[@]}; do
+		checkPackage extra pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz ${arch}
+		checkRemovedPackage testing pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz ${arch}
+	done
+}
+
 testMoveAnyPackages() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
@@ -60,12 +82,12 @@ testMoveSplitPackages() {
 	../db-move testing extra pkg-split-a
 
 	for arch in ${arches[@]}; do
-		for pkg in "${pkgdir}/pkg-split-a"/*-${arch}.pkg.tar.*; do
+		for pkg in "${pkgdir}/pkg-split-a"/*-${arch}${PKGEXT}; do
 			checkPackage extra $(basename ${pkg}) ${arch}
 		done
 	done
 	for arch in ${arches[@]}; do
-		for pkg in "${pkgdir}/pkg-split-b"/*-${arch}.pkg.tar.*; do
+		for pkg in "${pkgdir}/pkg-split-b"/*-${arch}${PKGEXT}; do
 			checkPackage testing $(basename ${pkg}) ${arch}
 		done
 	done