diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-08-21 14:52:06 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-08-21 15:54:38 +0300 |
| commit | 79f8122f41116659e944feb6675725d09663a0dd (patch) | |
| tree | 9142fd53a0e44c60e9df58a87f775efe18161477 /tests | |
| parent | 9f9ed70e2d85b0e8f5e2d9cf9969046034d9ad31 (diff) | |
| download | rpm-79f8122f41116659e944feb6675725d09663a0dd.tar.gz rpm-79f8122f41116659e944feb6675725d09663a0dd.tar.bz2 rpm-79f8122f41116659e944feb6675725d09663a0dd.zip | |
Polish the symlink config file comparison a bit
- Similar treatment as in commit 9f9ed70e2d85b0e8f5e2d9cf9969046034d9ad31,
pay more attention to what kind of files we're comparing in each case,
add a little breathing room and extra comments.
- Handle the case where on-disk link is identical to the one in new
package in which case no backup will be needed, fixing two cases
of unwanted backups in the test-suite.
(similar to commit 7a50e9de80ab3c47618dad1e9a5b2d9b79bfc8dc)
- Other than the on-disk vs new package change, probably doesn't change
anything yet, but prepares us for the next steps.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rpmconfig2.at | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/rpmconfig2.at b/tests/rpmconfig2.at index fbf304036..373bdf8f8 100644 --- a/tests/rpmconfig2.at +++ b/tests/rpmconfig2.at @@ -435,10 +435,8 @@ AT_CLEANUP # ------------------------------ # Modified config link matches the content from new package. -# Broken, unwanted backup taken. AT_SETUP([upgrade changing, modified config(noreplace) link 2]) AT_KEYWORDS([install]) -AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ RPMDB_CLEAR RPMDB_INIT @@ -725,9 +723,7 @@ AT_CLEANUP # ------------------------------ # Modified config link matches the content from new package. -# Broken, unwanted backup taken AT_SETUP([upgrade changing, modified shared config(noreplace) link 2]) -AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_KEYWORDS([install]) AT_CHECK([ RPMDB_CLEAR |