Skip to content

Commit f14ce0e

Browse files
committed
Update updateinfo-json.feature
- Change timestamps from ISO strings to UNIX integers for consistency - Change advisory info JSON output from object to array format Requires: rpm-software-management/dnf5#2495
1 parent 371e56e commit f14ce0e

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

dnf-behave-tests/dnf/updateinfo-json.feature

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ Scenario: Listing available updates in json format
1818
"type":"enhancement",
1919
"severity":"Moderate",
2020
"nevra":"flac-1.3.3-8.fc29.x86_64",
21-
"buildtime":"2019-01-17 00:00:00"
21+
"buildtime":1547683200
2222
},
2323
{
2424
"name":"FEDORA-2018-318f184000",
2525
"type":"bugfix",
2626
"severity":"none",
2727
"nevra":"glibc-2.28-26.fc29.x86_64",
28-
"buildtime":"2019-01-17 00:00:00"
28+
"buildtime":1547683200
2929
}
3030
]
3131
"""
@@ -42,7 +42,7 @@ Scenario: Listing available updates referencing bugizilla in json format
4242
"advisory_name":"FEDORA-2018-318f184000",
4343
"advisory_type":"bugfix",
4444
"advisory_severity":"bugfix",
45-
"advisory_buildtime":"2019-01-17 00:00:00",
45+
"advisory_buildtime":1547683200,
4646
"nevra":"glibc-2.28-26.fc29.x86_64",
4747
"references":[
4848
{
@@ -78,35 +78,35 @@ Scenario: Listing updates in json format with custom type and severity
7878
"type":"security",
7979
"severity":"Critical",
8080
"nevra":"labirinto-1.56.2-6.fc30.x86_64",
81-
"buildtime":"2019-09-15 01:34:29"
81+
"buildtime":1568511269
8282
},
8383
{
8484
"name":"FEDORA-2022-2222222222",
8585
"type":"custom_type",
8686
"severity":"custom_severity",
8787
"nevra":"labirinto-1.56.2-6.fc30.x86_64",
88-
"buildtime":"2019-09-15 01:34:29"
88+
"buildtime":1568511269
8989
},
9090
{
9191
"name":"FEDORA-2022-2222222223",
9292
"type":"security",
9393
"severity":"custom_severity",
9494
"nevra":"labirinto-1.56.2-6.fc30.x86_64",
95-
"buildtime":"2019-09-15 01:34:29"
95+
"buildtime":1568511269
9696
},
9797
{
9898
"name":"FEDORA-2022-2222222224",
9999
"type":"custom_type",
100100
"severity":"Critical",
101101
"nevra":"labirinto-1.56.2-6.fc30.x86_64",
102-
"buildtime":"2019-09-15 01:34:29"
102+
"buildtime":1568511269
103103
},
104104
{
105105
"name":"FEDORA-2019-f4eb34cf4c",
106106
"type":"security",
107107
"severity":"Moderate",
108108
"nevra":"labirinto-1.56.2-1.fc30.x86_64",
109-
"buildtime":"2019-05-12 01:21:43"
109+
"buildtime":1557624103
110110
}
111111
]
112112
"""
@@ -118,15 +118,15 @@ Scenario: Info about available updates in json format
118118
Then the exit code is 0
119119
And stdout json matches
120120
"""
121-
{
122-
"FEDORA-2018-318f184000":{
121+
[
122+
{
123123
"Name":"FEDORA-2018-318f184000",
124124
"Title":"glibc bug fix",
125125
"Severity":"none",
126126
"Type":"bugfix",
127127
"Status":"final",
128128
"Vendor":"[email protected]",
129-
"Issued":"2019-01-17 00:00:00",
129+
"Issued":1547683200,
130130
"Description":"Fix some stuff",
131131
"Message":"",
132132
"Rights":"",
@@ -156,14 +156,14 @@ Scenario: Info about available updates in json format
156156
]
157157
}
158158
},
159-
"FEDORA-2999:002-02":{
159+
{
160160
"Name":"FEDORA-2999:002-02",
161161
"Title":"flac enhacements",
162162
"Severity":"Moderate",
163163
"Type":"enhancement",
164164
"Status":"final",
165165
"Vendor":"[email protected]",
166-
"Issued":"2019-01-17 00:00:00",
166+
"Issued":1547683200,
167167
"Description":"Enhance some stuff",
168168
"Message":"",
169169
"Rights":"",
@@ -181,7 +181,7 @@ Scenario: Info about available updates in json format
181181
]
182182
}
183183
}
184-
}
184+
]
185185
"""
186186

187187

@@ -191,15 +191,15 @@ Scenario: Info about available updates referencing bugizilla in json format
191191
Then the exit code is 0
192192
And stdout json matches
193193
"""
194-
{
195-
"FEDORA-2018-318f184000":{
194+
[
195+
{
196196
"Name":"FEDORA-2018-318f184000",
197197
"Title":"glibc bug fix",
198198
"Severity":"none",
199199
"Type":"bugfix",
200200
"Status":"final",
201201
"Vendor":"[email protected]",
202-
"Issued":"2019-01-17 00:00:00",
202+
"Issued":1547683200,
203203
"Description":"Fix some stuff",
204204
"Message":"",
205205
"Rights":"",
@@ -229,7 +229,7 @@ Scenario: Info about available updates referencing bugizilla in json format
229229
]
230230
}
231231
}
232-
}
232+
]
233233
"""
234234

235235

@@ -238,7 +238,7 @@ Scenario: Info about updates in json format (when there's nothing to report)
238238
Then the exit code is 0
239239
And stdout is
240240
"""
241-
{{}}
241+
[]
242242
"""
243243

244244

@@ -250,15 +250,15 @@ Scenario: Info about updates in json format with custom type and severity
250250
Then the exit code is 0
251251
And stdout json matches
252252
"""
253-
{
254-
"FEDORA-2019-f4eb34cf4c":{
253+
[
254+
{
255255
"Name":"FEDORA-2019-f4eb34cf4c",
256256
"Title":"labirinto-1.56.2-1.fc30",
257257
"Severity":"Moderate",
258258
"Type":"security",
259259
"Status":"stable",
260260
"Vendor":"[email protected]",
261-
"Issued":"2019-05-12 01:21:43",
261+
"Issued":1557624103,
262262
"Description":"GNOME 3.32.2",
263263
"Message":"",
264264
"Rights":"Copyright (C) 2020 Red Hat, Inc. and others.",
@@ -278,14 +278,14 @@ Scenario: Info about updates in json format with custom type and severity
278278
]
279279
}
280280
},
281-
"FEDORA-2019-57b5902ed1":{
281+
{
282282
"Name":"FEDORA-2019-57b5902ed1",
283283
"Title":"labirinto-1.56.2-6.fc30 mozjs60-60.9.0-2.fc30 polkit-0.116-2.fc30",
284284
"Severity":"Critical",
285285
"Type":"security",
286286
"Status":"stable",
287287
"Vendor":"[email protected]",
288-
"Issued":"2019-09-15 01:34:29",
288+
"Issued":1568511269,
289289
"Description":"mozjs60 60.9.0, including various security, stability and regression fixes from Firefox 60.9.0 ESR. For details, see https:\/\/www.mozilla.org\/en-US\/firefox\/60.9.0\/releasenotes\/",
290290
"Message":"",
291291
"Rights":"Copyright (C) 2020 Red Hat, Inc. and others.",
@@ -298,14 +298,14 @@ Scenario: Info about updates in json format with custom type and severity
298298
]
299299
}
300300
},
301-
"FEDORA-2022-2222222222":{
301+
{
302302
"Name":"FEDORA-2022-2222222222",
303303
"Title":"labirinto-1.56.2-6.fc30 mozjs60-60.9.0-2.fc30 polkit-0.116-2.fc30",
304304
"Severity":"custom_severity",
305305
"Type":"custom_type",
306306
"Status":"stable",
307307
"Vendor":"[email protected]",
308-
"Issued":"2019-09-15 01:34:29",
308+
"Issued":1568511269,
309309
"Description":"advisory with custom type and seveirity",
310310
"Message":"",
311311
"Rights":"Copyright (C) 2020 Red Hat, Inc. and others.",
@@ -318,14 +318,14 @@ Scenario: Info about updates in json format with custom type and severity
318318
]
319319
}
320320
},
321-
"FEDORA-2022-2222222223":{
321+
{
322322
"Name":"FEDORA-2022-2222222223",
323323
"Title":"labirinto-1.56.2-6.fc30 mozjs60-60.9.0-2.fc30 polkit-0.116-2.fc30",
324324
"Severity":"custom_severity",
325325
"Type":"security",
326326
"Status":"stable",
327327
"Vendor":"[email protected]",
328-
"Issued":"2019-09-15 01:34:29",
328+
"Issued":1568511269,
329329
"Description":"advisory with custom seveirity",
330330
"Message":"",
331331
"Rights":"Copyright (C) 2020 Red Hat, Inc. and others.",
@@ -338,14 +338,14 @@ Scenario: Info about updates in json format with custom type and severity
338338
]
339339
}
340340
},
341-
"FEDORA-2022-2222222224":{
341+
{
342342
"Name":"FEDORA-2022-2222222224",
343343
"Title":"labirinto-1.56.2-6.fc30 mozjs60-60.9.0-2.fc30 polkit-0.116-2.fc30",
344344
"Severity":"Critical",
345345
"Type":"custom_type",
346346
"Status":"stable",
347347
"Vendor":"[email protected]",
348-
"Issued":"2019-09-15 01:34:29",
348+
"Issued":1568511269,
349349
"Description":"advisory with custom type",
350350
"Message":"",
351351
"Rights":"Copyright (C) 2020 Red Hat, Inc. and others.",
@@ -358,5 +358,5 @@ Scenario: Info about updates in json format with custom type and severity
358358
]
359359
}
360360
}
361-
}
361+
]
362362
"""

0 commit comments

Comments
 (0)