Tweak the conflict test descriptions a bit

diff --git a/tests/rpmconflict.at b/tests/rpmconflict.at
index 692e294..5dcd2d6 100644 (file)
--- a/tests/rpmconflict.at
+++ b/tests/rpmconflict.at
@@ -4,7 +4,7 @@ AT_BANNER([RPM file conflicts])
 
 # ------------------------------
 # (Build and) install conflicting package (should fail)
-AT_SETUP([rpm -U to package with file conflict])
+AT_SETUP([package with file conflict])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -28,7 +28,7 @@ AT_CLEANUP
 
 # ------------------------------
 # Install conflicting packages in same transaction (should fail)
-AT_SETUP([rpm -U two packages with a conflicting file])
+AT_SETUP([two packages with a conflicting file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -45,7 +45,7 @@ AT_CLEANUP
 
 # ------------------------------
 # (Build and) install package with shareable file
-AT_SETUP([rpm -U package with shareable file])
+AT_SETUP([package with shareable file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -69,7 +69,7 @@ AT_CLEANUP
 
 # ------------------------------
 # Install packages with shareable file in same transaction
-AT_SETUP([rpm -U two packages with shareable file])
+AT_SETUP([two packages with shareable file])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -86,7 +86,7 @@ AT_CLEANUP
 
 # ------------------------------
 # (Build and) install package with identical basename in different directories
-AT_SETUP([rpm -U with non-conflicting identical basenames])
+AT_SETUP([non-conflicting identical basenames])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -104,7 +104,7 @@ AT_CLEANUP
 
 # ------------------------------
 # (Build and) install package with a self-conflict due to directory symlinks
-AT_SETUP([rpm -U with conflicting identical basenames])
+AT_SETUP([conflicting identical basenames])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -124,7 +124,7 @@ runroot rpm -U "${TOPDIR}"/RPMS/noarch/selfconflict-1.0-1.noarch.rpm
 AT_CLEANUP
 # ------------------------------
 # File conflict between colored files, prefer 64bit
-AT_SETUP([rpm -U multilib elf conflict, prefer 64bit])
+AT_SETUP([multilib elf conflict, prefer 64bit])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -144,7 +144,7 @@ AT_CLEANUP
 
 # ------------------------------
 # File conflict between colored files, prefer 32bit
-AT_SETUP([rpm -U multilib elf conflict, prefer 32bit])
+AT_SETUP([multilib elf conflict, prefer 32bit])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -164,7 +164,7 @@ AT_CLEANUP
 
 # ------------------------------
 # File conflict between colored and non-colored file 1
-AT_SETUP([rpm -U multilib elf vs non-elf file conflict 1])
+AT_SETUP([multilib elf vs non-elf file conflict 1])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -185,7 +185,7 @@ runroot rpm -U --ignoreos --ignorearch --nodeps \
 AT_CLEANUP
 
 # File conflict between colored and non-colored file 2
-AT_SETUP([rpm -U multilib elf vs non-elf file conflict 2])
+AT_SETUP([multilib elf vs non-elf file conflict 2])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -210,7 +210,7 @@ runroot rpm -U --ignoreos --ignorearch --nodeps \
 AT_CLEANUP
 
 # File conflict between colored and non-colored file 3
-AT_SETUP([rpm -U multilib elf vs non-elf file conflict 3])
+AT_SETUP([multilib elf vs non-elf file conflict 3])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -236,7 +236,7 @@ AT_CLEANUP
 
 # ------------------------------
 # Removal conflict on directory -> symlink change
-AT_SETUP([rpm -U replacing directory with symlink])
+AT_SETUP([replacing directory with symlink])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
@@ -260,7 +260,7 @@ AT_CLEANUP
 
 # ------------------------------
 # Replace symlink with a directory
-AT_SETUP([rpm -U replacing symlink with directory])
+AT_SETUP([replacing symlink with directory])
 AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR