1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
|
From 826cbb8869e7d640fe3c2582a3a8dacf393e1ee0 Mon Sep 17 00:00:00 2001
From: Michal Domonkos <mdomonko@redhat.com>
Date: Wed, 21 Aug 2024 15:02:36 +0200
Subject: [PATCH] Fix -V option usage in our tests
Conflict:adapt context because 760eb8638 is not merged
Reference:https://github.com/rpm-software-management/rpm/commit/826cbb8869e7d640fe3c2582a3a8dacf393e1ee0
Coupling -V with -a when querying for specific packages makes little
sense and only causes the order of the output lines to depend on the
database ordering.
This is known to vary between the ndb and sqlite backends in particular,
confusing some of the tests that expect the lines to be in a specific
order.
While at it, fix all such questionable usages, even those that only
entail one package argument.
Fixes: #3242
---
tests/rpme.at | 16 ++++++++--------
tests/rpmverify.at | 38 +++++++++++++++++++-------------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/tests/rpme.at b/tests/rpme.at
index ead757579..058d929fd 100644
--- a/tests/rpme.at
+++ b/tests/rpme.at
@@ -293,9 +293,9 @@ done
RPMTEST_CHECK([
runroot rpm -U --ignoreos /build/RPMS/noarch/conflicta-1.0-1.noarch.rpm
runroot rpm -U --ignoreos --excludepath=/usr/share /build/RPMS/noarch/conflictb-1.0-1.noarch.rpm
-runroot rpm -Vav --nogroup --nouser conflicta conflictb
+runroot rpm -Vv --nogroup --nouser conflicta conflictb
runroot rpm -e conflicta
-runroot rpm -Vav --nogroup --nouser conflictb
+runroot rpm -Vv --nogroup --nouser conflictb
runroot rpm -e conflictb
runroot rpm -Vp --nogroup --nouser /build/RPMS/noarch/conflictb-1.0-1.noarch.rpm
],
@@ -310,9 +310,9 @@ missing /usr/share/my.version
RPMTEST_CHECK([
runroot rpm -U --ignoreos --excludepath=/usr/share /build/RPMS/noarch/conflicta-1.0-1.noarch.rpm
runroot rpm -U --ignoreos /build/RPMS/noarch/conflictb-1.0-1.noarch.rpm
-runroot rpm -Vav --nogroup --nouser conflicta conflictb
+runroot rpm -Vv --nogroup --nouser conflicta conflictb
runroot rpm -e conflicta
-runroot rpm -Vav --nogroup --nouser conflictb
+runroot rpm -Vv --nogroup --nouser conflictb
runroot rpm -e conflictb
runroot rpm -Vp --nogroup --nouser /build/RPMS/noarch/conflictb-1.0-1.noarch.rpm
],
@@ -327,9 +327,9 @@ missing /usr/share/my.version
RPMTEST_CHECK([
runroot rpm -U --ignoreos /build/RPMS/noarch/conflicta-1.0-1.noarch.rpm
runroot rpm -U --ignoreos --force /build/RPMS/noarch/conflictb-1.0-1.noarch.rpm
-runroot rpm -Vav --nogroup --nouser conflicta conflictb
+runroot rpm -Vv --nogroup --nouser conflicta conflictb
runroot rpm -e conflicta
-runroot rpm -Vav --nogroup --nouser conflictb
+runroot rpm -Vv --nogroup --nouser conflictb
runroot rpm -e conflictb
runroot rpm -Vp --nogroup --nouser /build/RPMS/noarch/conflictb-1.0-1.noarch.rpm
],
@@ -344,9 +344,9 @@ missing /usr/share/my.version
RPMTEST_CHECK([
runroot rpm -U --ignoreos /build/RPMS/noarch/conflicta-1.0-1.noarch.rpm
runroot rpm -U --ignoreos --force /build/RPMS/noarch/conflictb-1.0-1.noarch.rpm
-runroot rpm -Vav --nogroup --nouser conflicta conflictb
+runroot rpm -Vv --nogroup --nouser conflicta conflictb
runroot rpm -e conflictb
-runroot rpm -Vav --nogroup --nouser conflicta
+runroot rpm -Vv --nogroup --nouser conflicta
runroot rpm -e conflicta
],
[0],
diff --git a/tests/rpmverify.at b/tests/rpmverify.at
index 3a87b085f..32427021d 100644
--- a/tests/rpmverify.at
+++ b/tests/rpmverify.at
@@ -304,13 +304,13 @@ touch -t 201703171717 ${tf}
runroot rpm -U \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
cat "${tf}"
runroot rpm -U \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
cat "${tf}"
echo "xx" > "${tf}"
@@ -319,7 +319,7 @@ cat "${tf}"
runroot rpm -U \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-4.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
cat "${tf}"
touch -t 201703171717 ${tf}
@@ -327,7 +327,7 @@ touch -t 201703171717 ${tf}
runroot rpm -U --oldpackage \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
cat "${tf}"
],
[0],
@@ -352,7 +352,7 @@ touch -t 201703171717 ${tf}
runroot rpm -Uvv --fsmdebug \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-2.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
cat "${tf}"
@@ -360,7 +360,7 @@ cat "${tf}"
runroot rpm -Uvv --fsmdebug \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
cat "${tf}"
echo "xx" > "${tf}"
@@ -369,7 +369,7 @@ cat "${tf}"
runroot rpm -Uvv --fsmdebug \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-4.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
cat "${tf}"
@@ -378,7 +378,7 @@ touch -t 201703171717 ${tf}
runroot rpm -U -Uvv --fsmdebug --oldpackage \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
cat "${tf}"
],
@@ -449,13 +449,13 @@ readlink "${tf}"
runroot rpm -U \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
readlink "${tf}"
runroot rpm -U \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
readlink "${tf}"
ln -sf "xx" "${tf}"
@@ -464,13 +464,13 @@ readlink "${tf}"
runroot rpm -U \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-4.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
readlink "${tf}"
runroot rpm -U --oldpackage \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
readlink "${tf}"
],
[0],
@@ -494,7 +494,7 @@ readlink "${tf}"
runroot rpm -Uvv --fsmdebug \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-2.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
readlink "${tf}"
@@ -502,7 +502,7 @@ readlink "${tf}"
runroot rpm -Uvv --fsmdebug \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
readlink "${tf}"
ln -sf "xx" "${tf}"
@@ -511,14 +511,14 @@ readlink "${tf}"
runroot rpm -Uvv --fsmdebug \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-4.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
readlink "${tf}"
runroot rpm -U -Uvv --fsmdebug --oldpackage \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-3.0-1.noarch.rpm > output.txt 2>&1
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
grep -c "touch" output.txt
readlink "${tf}"
],
@@ -554,17 +554,17 @@ for v in "1.0" "2.0"; do
done
runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
runroot rpm -U \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-2.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
chmod 777 "${tf}"
runroot rpm -U \
--oldpackage \
--define "_minimize_writes 1" \
/build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
-runroot rpm -Va --nouser --nogroup replacetest
+runroot rpm -V --nouser --nogroup replacetest
],
[0],
[],
--
2.33.0
|
