Skip to content

Commit c9cc60d

Browse files
committed
Adapt unit tests for GardenLinux feature changes
Signed-off-by: Tobias Wolf <[email protected]> On-behalf-of: SAP <[email protected]>
1 parent e20631f commit c9cc60d

File tree

3 files changed

+57
-16
lines changed

3 files changed

+57
-16
lines changed

test-data/gardenlinux

Submodule gardenlinux updated 757 files

tests/features/test_features_parser.py

Lines changed: 53 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,76 @@
1212
"aws-gardener_prod",
1313
{
1414
"platform": ["aws"],
15-
"element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
16-
"flag": ["_boot", "_nopkg", "_prod", "_slim"],
15+
"element": [
16+
"log",
17+
"sap",
18+
"ssh",
19+
"base",
20+
"server",
21+
"cloud",
22+
"multipath",
23+
"iscsi",
24+
"nvme",
25+
"gardener",
26+
],
27+
"flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
1728
},
1829
),
1930
(
2031
"gcp-gardener_prod",
2132
{
2233
"platform": ["gcp"],
23-
"element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
24-
"flag": ["_boot", "_nopkg", "_prod", "_slim"],
34+
"element": [
35+
"log",
36+
"sap",
37+
"ssh",
38+
"base",
39+
"server",
40+
"cloud",
41+
"multipath",
42+
"iscsi",
43+
"nvme",
44+
"gardener",
45+
],
46+
"flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
2547
},
2648
),
2749
(
2850
"azure-gardener_prod",
2951
{
3052
"platform": ["azure"],
31-
"element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
32-
"flag": ["_boot", "_nopkg", "_prod", "_slim"],
53+
"element": [
54+
"log",
55+
"sap",
56+
"ssh",
57+
"base",
58+
"server",
59+
"cloud",
60+
"multipath",
61+
"iscsi",
62+
"nvme",
63+
"gardener",
64+
],
65+
"flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
3366
},
3467
),
3568
(
3669
"ali-gardener_prod",
3770
{
3871
"platform": ["ali"],
39-
"element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
40-
"flag": ["_boot", "_nopkg", "_prod", "_slim"],
72+
"element": [
73+
"log",
74+
"sap",
75+
"ssh",
76+
"base",
77+
"server",
78+
"cloud",
79+
"multipath",
80+
"iscsi",
81+
"nvme",
82+
"gardener",
83+
],
84+
"flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
4185
},
4286
),
4387
(
@@ -54,7 +98,7 @@
5498
"chost",
5599
"khost",
56100
],
57-
"flag": ["_boot", "_dev", "_selinux", "_slim"],
101+
"flag": ["_dev", "_fwcfg", "_legacy", "_selinux", "_slim"],
58102
},
59103
),
60104
],

tests/features/test_main.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,7 @@ def test_main_with_exclude_cname_print_elements(monkeypatch, capsys):
402402
# Assert
403403
captured = capsys.readouterr().out.strip()
404404

405-
assert (
406-
"log,sap,ssh,base,server,gardener"
407-
== captured
408-
)
405+
assert "log,sap,ssh,base,server,multipath,iscsi,nvme,gardener" == captured
409406

410407

411408
def test_main_with_exclude_cname_print_features(monkeypatch, capsys):
@@ -420,7 +417,7 @@ def test_main_with_exclude_cname_print_features(monkeypatch, capsys):
420417
"--cname",
421418
"kvm-gardener_prod",
422419
"--ignore",
423-
"cloud",
420+
"log",
424421
"--arch",
425422
"amd64",
426423
"--version",
@@ -438,6 +435,6 @@ def test_main_with_exclude_cname_print_features(monkeypatch, capsys):
438435
captured = capsys.readouterr().out.strip()
439436

440437
assert (
441-
"log,sap,ssh,_boot,_ignite,kvm,_nopkg,_prod,_slim,base,server,gardener"
438+
"sap,ssh,_fwcfg,_ignite,_legacy,_nopkg,_prod,_slim,base,server,cloud,kvm,multipath,iscsi,nvme,gardener"
442439
== captured
443440
)

0 commit comments

Comments
 (0)