From f5b288fef63f471a2b347698946547a08f277610 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 1 Apr 2011 17:43:13 +0300
Subject: [PATCH] Explicitly initialize the test-root database always -
 Otherwise various places will be emitting "generating xx missing indexes"  
 warnings, we dont want that noise in the test-suite results

---
 tests/rpmconfig.at   | 4 ++++
 tests/rpmconflict.at | 6 ++++++
 tests/rpmdb.at       | 4 ++++
 tests/rpmdeps.at     | 7 +++++++
 tests/rpmi.at        | 6 ++++++
 tests/rpmverify.at   | 6 ++++++
 6 files changed, 33 insertions(+)

diff --git a/tests/rpmconfig.at b/tests/rpmconfig.at
index cbf4868..c8ad81a 100644
--- a/tests/rpmconfig.at
+++ b/tests/rpmconfig.at
@@ -8,6 +8,7 @@ AT_SETUP([rpm -U to package with unchanged config file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -rf "${RPMTEST}/etc/my.conf"
 
@@ -31,6 +32,7 @@ AT_SETUP([rpm -U to package with locally modified config file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -rf "${RPMTEST}/etc/my.conf"
 
@@ -55,6 +57,7 @@ AT_SETUP([rpm -U to package with unchanged config file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -rf "${RPMTEST}/etc/my.conf"
 
@@ -78,6 +81,7 @@ AT_SETUP([rpm -U to package with modified config file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -rf "${RPMTEST}/etc/my.conf"
 
diff --git a/tests/rpmconflict.at b/tests/rpmconflict.at
index 802804d..86e6aa1 100644
--- a/tests/rpmconflict.at
+++ b/tests/rpmconflict.at
@@ -8,6 +8,7 @@ AT_SETUP([rpm -U to package with file conflict])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 for p in "one" "two"; do
@@ -31,6 +32,7 @@ AT_SETUP([rpm -U two packages with a conflicting file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 runroot rpm -U \
   "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm \
@@ -47,6 +49,7 @@ AT_SETUP([rpm -U package with shareable file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 for p in "one" "two"; do
@@ -70,6 +73,7 @@ AT_SETUP([rpm -U two packages with shareable file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 runroot rpm -U \
   "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm \
@@ -87,6 +91,7 @@ AT_SETUP([rpm -U replacing directory with symlink])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -rf "${RPMTEST}"/usr/{share,lib}/symlinktest*
 
@@ -114,6 +119,7 @@ AT_SETUP([rpm -U replacing symlink with directory])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -rf "${RPMTEST}"/usr/{share,lib}/symlinktest*
 
diff --git a/tests/rpmdb.at b/tests/rpmdb.at
index 598d644..2675e01 100644
--- a/tests/rpmdb.at
+++ b/tests/rpmdb.at
@@ -134,6 +134,7 @@ AT_SETUP([rpm -U and verify status])
 AT_KEYWORDS([install rpmdb query])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -156,6 +157,7 @@ AT_SETUP([rpm -U with _install_lang and verify status])
 AT_KEYWORDS([install rpmdb query])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -180,6 +182,7 @@ AT_SETUP([rpm -U and verify files on disk])
 AT_KEYWORDS([install rpmdb])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -f "${RPMTEST}"/usr/share/my.version
 
@@ -202,6 +205,7 @@ AT_SETUP([rpm -e and verify files removed])
 AT_KEYWORDS([install rpmdb])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 rm -f "${RPMTEST}"/usr/share/my.version
 
diff --git a/tests/rpmdeps.at b/tests/rpmdeps.at
index 0254a11..c550151 100644
--- a/tests/rpmdeps.at
+++ b/tests/rpmdeps.at
@@ -8,6 +8,7 @@ AT_SETUP([missing dependency])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -30,6 +31,7 @@ AT_SETUP([cross-depending packages])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -55,6 +57,7 @@ AT_SETUP([unsatisfied versioned require])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -82,6 +85,7 @@ AT_SETUP([satisfied versioned require])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -107,6 +111,7 @@ AT_SETUP([versioned conflict in transaction])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -133,6 +138,7 @@ AT_SETUP([versioned conflict in database])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -159,6 +165,7 @@ AT_SETUP([erase to break dependencies])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
diff --git a/tests/rpmi.at b/tests/rpmi.at
index 4d53633..8694c54 100644
--- a/tests/rpmi.at
+++ b/tests/rpmi.at
@@ -102,6 +102,7 @@ AT_CLEANUP
 AT_SETUP([rpm -U upgrade to newer])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 for v in "1.0" "2.0"; do
@@ -124,6 +125,7 @@ AT_CLEANUP
 AT_SETUP([rpm -U upgrade to older])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm
 runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm
@@ -138,6 +140,7 @@ AT_CLEANUP
 AT_SETUP([rpm -U --oldpackage downgrade])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 runroot rpm -U "${TOPDIR}"/RPMS/noarch/versiontest-2.0-1.noarch.rpm
 runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm
@@ -153,6 +156,7 @@ AT_CLEANUP
 AT_SETUP([rpm -U two versions of same package])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 runroot rpm -U \
   "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
@@ -169,6 +173,7 @@ AT_CLEANUP
 AT_SETUP([rpm -i two versions of same package])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 runroot rpm -i \
   "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
@@ -187,6 +192,7 @@ AT_CLEANUP
 AT_SETUP([rpm -i identical versions of same package])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 runroot rpm -i \
   "${TOPDIR}"/RPMS/noarch/versiontest-1.0-1.noarch.rpm \
diff --git a/tests/rpmverify.at b/tests/rpmverify.at
index 87bcdee..bf06844 100644
--- a/tests/rpmverify.at
+++ b/tests/rpmverify.at
@@ -8,6 +8,7 @@ AT_SETUP([dependency problems])
 AT_KEYWORDS([verify])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 rm -rf "${TOPDIR}"
 
 run rpmbuild --quiet -bb \
@@ -32,6 +33,7 @@ AT_SETUP([files with no problems])
 AT_KEYWORDS([verify])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 tpkg="hello-1.0-1.i386.rpm"
 cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}"
@@ -49,6 +51,7 @@ AT_SETUP([files with no problems in verbose mode])
 AT_KEYWORDS([verify])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 tpkg="hello-1.0-1.i386.rpm"
 cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}"
@@ -69,6 +72,7 @@ AT_SETUP([verify files with problems present])
 AT_KEYWORDS([verify])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 tpkg="hello-1.0-1.i386.rpm"
 cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}"
@@ -93,6 +97,7 @@ AT_SETUP([verifyscript failure])
 AT_KEYWORDS([verify])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 rm -rf "${TOPDIR}"
 run rpmbuild --quiet -bb "${RPMDATA}"/SPECS/verifyscript.spec
@@ -109,6 +114,7 @@ AT_SETUP([verifyscript success])
 AT_KEYWORDS([verify])
 AT_CHECK([
 RPMDB_CLEAR
+RPMDB_INIT
 
 rm -rf "${TOPDIR}"
 run rpmbuild --quiet -bb "${RPMDATA}"/SPECS/verifyscript.spec
-- 
2.7.4