summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2012-08-22 16:58:09 +0300
committerPanu Matilainen <pmatilai@redhat.com>2012-08-23 11:58:59 +0300
commitd7c3b4aaa05f6da263b189e8111052d353aae3a2 (patch)
treecc01bc4859ef72fe8b38e42082b18d1d37af93b3 /tests
parentc4f18ab2dec449b05a2e7f40e7726886429a2112 (diff)
downloadrpm-d7c3b4aaa05f6da263b189e8111052d353aae3a2.tar.gz
rpm-d7c3b4aaa05f6da263b189e8111052d353aae3a2.tar.bz2
rpm-d7c3b4aaa05f6da263b189e8111052d353aae3a2.zip
Simplify the non-modified config file vs directory test
- Replacing a directory with something else is more complicated than other cases and deserves tests of its own. For simplicity in the config cases, remove the "and back" part of the test, and now this test actually succeeds.
Diffstat (limited to 'tests')
-rw-r--r--tests/rpmconfig3.at16
1 files changed, 3 insertions, 13 deletions
diff --git a/tests/rpmconfig3.at b/tests/rpmconfig3.at
index 20b084e85..6191ef3fe 100644
--- a/tests/rpmconfig3.at
+++ b/tests/rpmconfig3.at
@@ -246,13 +246,9 @@ otherstuff
)
AT_CLEANUP
-# Non-modified config file changes to directory and back
-# Seems broken, unwanted backup of the directory (directory renamed) taken
-# when changing back from directory to file. OTOH what if the directory
-# is not empty?
-AT_SETUP([upgrade config to/from directory])
+# Non-modified config file changes to directory.
+AT_SETUP([upgrade config to directory])
AT_KEYWORDS([install])
-AT_XFAIL_IF([test $RPM_XFAIL -gt 0])
AT_CHECK([
RPMDB_CLEAR
RPMDB_INIT
@@ -275,16 +271,11 @@ runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
cat "${cf}"
runroot rpm -U "${TOPDIR}"/RPMS/noarch/configtest-2.0-1.noarch.rpm
test -d "${cf}"
-runroot rpm -U --oldpackage "${TOPDIR}"/RPMS/noarch/configtest-1.0-1.noarch.rpm
-cat "${cf}"
-test ! -d "${cf}.rpmsave"
],
[0],
[foo
-foo
],
-[warning: /etc/my.conf saved as /etc/my.conf.rpmsave]
-)
+[])
AT_CLEANUP
# Modified config changes to directory
@@ -326,4 +317,3 @@ otherstuff
[warning: /etc/my.conf saved as /etc/my.conf.rpmsave]
)
AT_CLEANUP
-