Merge ~dbungert/curtin:vmtest-cleanup-2023-09-19 into curtin:master
- Git
- lp:~dbungert/curtin
- vmtest-cleanup-2023-09-19
- Merge into master
Status: | Merged |
---|---|
Merge reported by: | Dan Bungert |
Merged at revision: | 321360ef2c62c33a2d94857e065c62b17aee0b30 |
Proposed branch: | ~dbungert/curtin:vmtest-cleanup-2023-09-19 |
Merge into: | curtin:master |
Diff against target: |
1315 lines (+179/-167) 52 files modified
tests/vmtests/helpers.py (+4/-0) tests/vmtests/releases.py (+10/-10) tests/vmtests/test_apt_config_cmd.py (+2/-2) tests/vmtests/test_basic.py (+4/-4) tests/vmtests/test_basic_dasd.py (+2/-2) tests/vmtests/test_bcache_basic.py (+2/-2) tests/vmtests/test_bcache_bug1718699.py (+2/-2) tests/vmtests/test_bcache_ceph.py (+4/-4) tests/vmtests/test_bcache_partitions.py (+2/-2) tests/vmtests/test_fs_battery.py (+2/-2) tests/vmtests/test_iscsi.py (+2/-2) tests/vmtests/test_journald_reporter.py (+2/-2) tests/vmtests/test_lvm.py (+2/-2) tests/vmtests/test_lvm_iscsi.py (+2/-2) tests/vmtests/test_lvm_raid.py (+5/-2) tests/vmtests/test_lvm_root.py (+4/-4) tests/vmtests/test_mdadm_bcache.py (+18/-18) tests/vmtests/test_mdadm_iscsi.py (+2/-2) tests/vmtests/test_multipath.py (+4/-4) tests/vmtests/test_multipath_lvm.py (+5/-5) tests/vmtests/test_network.py (+2/-2) tests/vmtests/test_network_alias.py (+2/-2) tests/vmtests/test_network_bonding.py (+2/-2) tests/vmtests/test_network_bridging.py (+2/-2) tests/vmtests/test_network_disabled.py (+10/-10) tests/vmtests/test_network_ipv6.py (+2/-2) tests/vmtests/test_network_ipv6_static.py (+2/-2) tests/vmtests/test_network_ipv6_vlan.py (+2/-2) tests/vmtests/test_network_mtu.py (+2/-2) tests/vmtests/test_network_ovs.py (+2/-2) tests/vmtests/test_network_static.py (+2/-2) tests/vmtests/test_network_static_routes.py (+3/-3) tests/vmtests/test_network_vlan.py (+2/-2) tests/vmtests/test_nvme.py (+8/-4) tests/vmtests/test_panic.py (+2/-2) tests/vmtests/test_pollinate_useragent.py (+2/-2) tests/vmtests/test_preserve.py (+2/-2) tests/vmtests/test_preserve_bcache.py (+2/-2) tests/vmtests/test_preserve_lvm.py (+2/-2) tests/vmtests/test_preserve_partition_wipe_vg.py (+6/-6) tests/vmtests/test_preserve_raid.py (+6/-6) tests/vmtests/test_python_apt.py (+2/-2) tests/vmtests/test_raid5_bcache.py (+2/-2) tests/vmtests/test_raid_partition_to_disk.py (+2/-2) tests/vmtests/test_reuse_lvm_member.py (+3/-3) tests/vmtests/test_reuse_msdos_partitions.py (+3/-3) tests/vmtests/test_reuse_raid_member.py (+5/-5) tests/vmtests/test_reuse_uefi_esp.py (+2/-2) tests/vmtests/test_simple.py (+6/-6) tests/vmtests/test_uefi_basic.py (+4/-4) tests/vmtests/test_zfsroot.py (+4/-4) tools/vmtest-system-setup (+1/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Hudson-Doyle | Approve | ||
Server Team CI bot | continuous-integration | Approve | |
Review via email: mp+451677@code.launchpad.net |
Commit message
vmtests: several fixes to modernize
* Update vmtests
* Make test loading failures more verbose
* fix the vmtest-system-setup script for python3-debian
Description of the change
Dan Bungert (dbungert) wrote : | # |
Server Team CI bot (server-team-bot) wrote : | # |
FAILED: Continuous integration, rev:0a031245d0f
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Server Team CI bot (server-team-bot) wrote : | # |
PASSED: Continuous integration, rev:321360ef2c6
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
Michael Hudson-Doyle (mwhudson) : | # |
Preview Diff
1 | diff --git a/tests/vmtests/helpers.py b/tests/vmtests/helpers.py | |||
2 | index 835baed..4c9f40c 100644 | |||
3 | --- a/tests/vmtests/helpers.py | |||
4 | +++ b/tests/vmtests/helpers.py | |||
5 | @@ -122,6 +122,10 @@ def find_testcases(**kwargs): | |||
6 | 122 | filter_attrs = [attr for attr, value in kwargs.items() if value] | 122 | filter_attrs = [attr for attr, value in kwargs.items() if value] |
7 | 123 | for mts in module_test_suites: | 123 | for mts in module_test_suites: |
8 | 124 | for class_test_suite in mts: | 124 | for class_test_suite in mts: |
9 | 125 | if hasattr(class_test_suite, '_exception'): | ||
10 | 126 | # if the test fails to load, it may have an _exception with the | ||
11 | 127 | # underlying issue. | ||
12 | 128 | raise class_test_suite._exception | ||
13 | 125 | for test_case in class_test_suite: | 129 | for test_case in class_test_suite: |
14 | 126 | # skip disabled tests | 130 | # skip disabled tests |
15 | 127 | if not getattr(test_case, '__test__', False): | 131 | if not getattr(test_case, '__test__', False): |
16 | diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py | |||
17 | index 67248bf..7519c57 100644 | |||
18 | --- a/tests/vmtests/releases.py | |||
19 | +++ b/tests/vmtests/releases.py | |||
20 | @@ -165,18 +165,18 @@ class _FocalBase(_UbuntuBase): | |||
21 | 165 | subarch = "ga-20.04" | 165 | subarch = "ga-20.04" |
22 | 166 | 166 | ||
23 | 167 | 167 | ||
27 | 168 | class _HirsuteBase(_UbuntuBase): | 168 | class _JammyBase(_UbuntuBase): |
28 | 169 | release = "hirsute" | 169 | release = "jammy" |
29 | 170 | target_release = "hirsute" | 170 | target_release = "jammy" |
30 | 171 | if _UbuntuBase.arch == "arm64": | 171 | if _UbuntuBase.arch == "arm64": |
32 | 172 | subarch = "ga-21.04" | 172 | subarch = "ga-22.04" |
33 | 173 | 173 | ||
34 | 174 | 174 | ||
38 | 175 | class _ImpishBase(_UbuntuBase): | 175 | class _ManticBase(_UbuntuBase): |
39 | 176 | release = "impish" | 176 | release = "mantic" |
40 | 177 | target_release = "impish" | 177 | target_release = "mantic" |
41 | 178 | if _UbuntuBase.arch == "arm64": | 178 | if _UbuntuBase.arch == "arm64": |
43 | 179 | subarch = "ga-21.10" | 179 | subarch = "ga-23.10" |
44 | 180 | 180 | ||
45 | 181 | 181 | ||
46 | 182 | class _Releases(object): | 182 | class _Releases(object): |
47 | @@ -197,8 +197,8 @@ class _Releases(object): | |||
48 | 197 | disco = _DiscoBase | 197 | disco = _DiscoBase |
49 | 198 | eoan = _EoanBase | 198 | eoan = _EoanBase |
50 | 199 | focal = _FocalBase | 199 | focal = _FocalBase |
53 | 200 | hirsute = _HirsuteBase | 200 | jammy = _JammyBase |
54 | 201 | impish = _ImpishBase | 201 | mantic = _ManticBase |
55 | 202 | 202 | ||
56 | 203 | 203 | ||
57 | 204 | class _CentosReleases(object): | 204 | class _CentosReleases(object): |
58 | diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py | |||
59 | index 2fdd971..50ea224 100644 | |||
60 | --- a/tests/vmtests/test_apt_config_cmd.py | |||
61 | +++ b/tests/vmtests/test_apt_config_cmd.py | |||
62 | @@ -68,11 +68,11 @@ class FocalTestAptConfigCMDCMD(relbase.focal, TestAptConfigCMD): | |||
63 | 68 | __test__ = True | 68 | __test__ = True |
64 | 69 | 69 | ||
65 | 70 | 70 | ||
67 | 71 | class HirsuteTestAptConfigCMDCMD(relbase.hirsute, TestAptConfigCMD): | 71 | class JammyTestAptConfigCMDCMD(relbase.jammy, TestAptConfigCMD): |
68 | 72 | __test__ = True | 72 | __test__ = True |
69 | 73 | 73 | ||
70 | 74 | 74 | ||
72 | 75 | class ImpishTestAptConfigCMDCMD(relbase.impish, TestAptConfigCMD): | 75 | class ManticTestAptConfigCMDCMD(relbase.mantic, TestAptConfigCMD): |
73 | 76 | __test__ = True | 76 | __test__ = True |
74 | 77 | 77 | ||
75 | 78 | 78 | ||
76 | diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py | |||
77 | index 616d635..1a99395 100644 | |||
78 | --- a/tests/vmtests/test_basic.py | |||
79 | +++ b/tests/vmtests/test_basic.py | |||
80 | @@ -234,11 +234,11 @@ class FocalTestBasic(relbase.focal, TestBasicAbs): | |||
81 | 234 | __test__ = True | 234 | __test__ = True |
82 | 235 | 235 | ||
83 | 236 | 236 | ||
85 | 237 | class HirsuteTestBasic(relbase.hirsute, TestBasicAbs): | 237 | class JammyTestBasic(relbase.jammy, TestBasicAbs): |
86 | 238 | __test__ = True | 238 | __test__ = True |
87 | 239 | 239 | ||
88 | 240 | 240 | ||
90 | 241 | class ImpishTestBasic(relbase.impish, TestBasicAbs): | 241 | class ManticTestBasic(relbase.mantic, TestBasicAbs): |
91 | 242 | __test__ = True | 242 | __test__ = True |
92 | 243 | 243 | ||
93 | 244 | 244 | ||
94 | @@ -358,11 +358,11 @@ class FocalTestScsiBasic(relbase.focal, TestBasicScsiAbs): | |||
95 | 358 | __test__ = True | 358 | __test__ = True |
96 | 359 | 359 | ||
97 | 360 | 360 | ||
99 | 361 | class HirsuteTestScsiBasic(relbase.hirsute, TestBasicScsiAbs): | 361 | class JammyTestScsiBasic(relbase.jammy, TestBasicScsiAbs): |
100 | 362 | __test__ = True | 362 | __test__ = True |
101 | 363 | 363 | ||
102 | 364 | 364 | ||
104 | 365 | class ImpishTestScsiBasic(relbase.impish, TestBasicScsiAbs): | 365 | class ManticTestScsiBasic(relbase.mantic, TestBasicScsiAbs): |
105 | 366 | __test__ = True | 366 | __test__ = True |
106 | 367 | 367 | ||
107 | 368 | 368 | ||
108 | diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py | |||
109 | index 0aa35fd..3ab7544 100644 | |||
110 | --- a/tests/vmtests/test_basic_dasd.py | |||
111 | +++ b/tests/vmtests/test_basic_dasd.py | |||
112 | @@ -56,11 +56,11 @@ class FocalTestBasicDasd(relbase.focal, TestBasicDasd): | |||
113 | 56 | __test__ = True | 56 | __test__ = True |
114 | 57 | 57 | ||
115 | 58 | 58 | ||
117 | 59 | class HirsuteTestBasicDasd(relbase.hirsute, TestBasicDasd): | 59 | class JammyTestBasicDasd(relbase.jammy, TestBasicDasd): |
118 | 60 | __test__ = True | 60 | __test__ = True |
119 | 61 | 61 | ||
120 | 62 | 62 | ||
122 | 63 | class ImpishTestBasicDasd(relbase.impish, TestBasicDasd): | 63 | class ManticTestBasicDasd(relbase.mantic, TestBasicDasd): |
123 | 64 | __test__ = True | 64 | __test__ = True |
124 | 65 | 65 | ||
125 | 66 | 66 | ||
126 | diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py | |||
127 | index 490ae4c..f4d8731 100644 | |||
128 | --- a/tests/vmtests/test_bcache_basic.py | |||
129 | +++ b/tests/vmtests/test_bcache_basic.py | |||
130 | @@ -68,11 +68,11 @@ class FocalBcacheBasic(relbase.focal, TestBcacheBasic): | |||
131 | 68 | __test__ = True | 68 | __test__ = True |
132 | 69 | 69 | ||
133 | 70 | 70 | ||
135 | 71 | class HirsuteBcacheBasic(relbase.hirsute, TestBcacheBasic): | 71 | class JammyBcacheBasic(relbase.jammy, TestBcacheBasic): |
136 | 72 | __test__ = True | 72 | __test__ = True |
137 | 73 | 73 | ||
138 | 74 | 74 | ||
140 | 75 | class ImpishBcacheBasic(relbase.impish, TestBcacheBasic): | 75 | class ManticBcacheBasic(relbase.mantic, TestBcacheBasic): |
141 | 76 | __test__ = True | 76 | __test__ = True |
142 | 77 | 77 | ||
143 | 78 | 78 | ||
144 | diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py | |||
145 | index 3b19c41..6eb781c 100644 | |||
146 | --- a/tests/vmtests/test_bcache_bug1718699.py | |||
147 | +++ b/tests/vmtests/test_bcache_bug1718699.py | |||
148 | @@ -23,11 +23,11 @@ class FocalTestBcacheBug1718699(relbase.focal, TestBcacheBug1718699): | |||
149 | 23 | __test__ = True | 23 | __test__ = True |
150 | 24 | 24 | ||
151 | 25 | 25 | ||
153 | 26 | class HirsuteTestBcacheBug1718699(relbase.hirsute, TestBcacheBug1718699): | 26 | class JammyTestBcacheBug1718699(relbase.jammy, TestBcacheBug1718699): |
154 | 27 | __test__ = True | 27 | __test__ = True |
155 | 28 | 28 | ||
156 | 29 | 29 | ||
158 | 30 | class ImpishTestBcacheBug1718699(relbase.impish, TestBcacheBug1718699): | 30 | class ManticTestBcacheBug1718699(relbase.mantic, TestBcacheBug1718699): |
159 | 31 | __test__ = True | 31 | __test__ = True |
160 | 32 | 32 | ||
161 | 33 | 33 | ||
162 | diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py | |||
163 | index 713ade9..9bc7287 100644 | |||
164 | --- a/tests/vmtests/test_bcache_ceph.py | |||
165 | +++ b/tests/vmtests/test_bcache_ceph.py | |||
166 | @@ -79,11 +79,11 @@ class FocalTestBcacheCeph(relbase.focal, TestBcacheCeph): | |||
167 | 79 | __test__ = True | 79 | __test__ = True |
168 | 80 | 80 | ||
169 | 81 | 81 | ||
171 | 82 | class HirsuteTestBcacheCeph(relbase.hirsute, TestBcacheCeph): | 82 | class JammyTestBcacheCeph(relbase.jammy, TestBcacheCeph): |
172 | 83 | __test__ = True | 83 | __test__ = True |
173 | 84 | 84 | ||
174 | 85 | 85 | ||
176 | 86 | class ImpishTestBcacheCeph(relbase.impish, TestBcacheCeph): | 86 | class ManticTestBcacheCeph(relbase.mantic, TestBcacheCeph): |
177 | 87 | __test__ = True | 87 | __test__ = True |
178 | 88 | 88 | ||
179 | 89 | 89 | ||
180 | @@ -113,11 +113,11 @@ class FocalTestBcacheCephLvm(relbase.focal, TestBcacheCephLvm): | |||
181 | 113 | __test__ = True | 113 | __test__ = True |
182 | 114 | 114 | ||
183 | 115 | 115 | ||
185 | 116 | class HirsuteTestBcacheCephLvm(relbase.hirsute, TestBcacheCephLvm): | 116 | class JammyTestBcacheCephLvm(relbase.jammy, TestBcacheCephLvm): |
186 | 117 | __test__ = True | 117 | __test__ = True |
187 | 118 | 118 | ||
188 | 119 | 119 | ||
190 | 120 | class ImpishTestBcacheCephLvm(relbase.impish, TestBcacheCephLvm): | 120 | class ManticTestBcacheCephLvm(relbase.mantic, TestBcacheCephLvm): |
191 | 121 | __test__ = True | 121 | __test__ = True |
192 | 122 | 122 | ||
193 | 123 | 123 | ||
194 | diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py | |||
195 | index 6268fd5..52cfd03 100644 | |||
196 | --- a/tests/vmtests/test_bcache_partitions.py | |||
197 | +++ b/tests/vmtests/test_bcache_partitions.py | |||
198 | @@ -29,11 +29,11 @@ class FocalTestBcachePartitions(relbase.focal, TestBcachePartitions): | |||
199 | 29 | __test__ = True | 29 | __test__ = True |
200 | 30 | 30 | ||
201 | 31 | 31 | ||
203 | 32 | class HirsuteTestBcachePartitions(relbase.hirsute, TestBcachePartitions): | 32 | class JammyTestBcachePartitions(relbase.jammy, TestBcachePartitions): |
204 | 33 | __test__ = True | 33 | __test__ = True |
205 | 34 | 34 | ||
206 | 35 | 35 | ||
208 | 36 | class ImpishTestBcachePartitions(relbase.impish, TestBcachePartitions): | 36 | class ManticTestBcachePartitions(relbase.mantic, TestBcachePartitions): |
209 | 37 | __test__ = True | 37 | __test__ = True |
210 | 38 | 38 | ||
211 | 39 | 39 | ||
212 | diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py | |||
213 | index 7d70f9c..034f10f 100644 | |||
214 | --- a/tests/vmtests/test_fs_battery.py | |||
215 | +++ b/tests/vmtests/test_fs_battery.py | |||
216 | @@ -243,11 +243,11 @@ class FocalTestFsBattery(relbase.focal, TestFsBattery): | |||
217 | 243 | __test__ = True | 243 | __test__ = True |
218 | 244 | 244 | ||
219 | 245 | 245 | ||
221 | 246 | class HirsuteTestFsBattery(relbase.hirsute, TestFsBattery): | 246 | class JammyTestFsBattery(relbase.jammy, TestFsBattery): |
222 | 247 | __test__ = True | 247 | __test__ = True |
223 | 248 | 248 | ||
224 | 249 | 249 | ||
226 | 250 | class ImpishTestFsBattery(relbase.impish, TestFsBattery): | 250 | class ManticTestFsBattery(relbase.mantic, TestFsBattery): |
227 | 251 | __test__ = True | 251 | __test__ = True |
228 | 252 | 252 | ||
229 | 253 | 253 | ||
230 | diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py | |||
231 | index 2fd9866..05c28fc 100644 | |||
232 | --- a/tests/vmtests/test_iscsi.py | |||
233 | +++ b/tests/vmtests/test_iscsi.py | |||
234 | @@ -76,11 +76,11 @@ class FocalTestIscsiBasic(relbase.focal, TestBasicIscsiAbs): | |||
235 | 76 | __test__ = True | 76 | __test__ = True |
236 | 77 | 77 | ||
237 | 78 | 78 | ||
239 | 79 | class HirsuteTestIscsiBasic(relbase.hirsute, TestBasicIscsiAbs): | 79 | class JammyTestIscsiBasic(relbase.jammy, TestBasicIscsiAbs): |
240 | 80 | __test__ = True | 80 | __test__ = True |
241 | 81 | 81 | ||
242 | 82 | 82 | ||
244 | 83 | class ImpishTestIscsiBasic(relbase.impish, TestBasicIscsiAbs): | 83 | class ManticTestIscsiBasic(relbase.mantic, TestBasicIscsiAbs): |
245 | 84 | __test__ = True | 84 | __test__ = True |
246 | 85 | 85 | ||
247 | 86 | 86 | ||
248 | diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py | |||
249 | index 064d71a..299fef7 100644 | |||
250 | --- a/tests/vmtests/test_journald_reporter.py | |||
251 | +++ b/tests/vmtests/test_journald_reporter.py | |||
252 | @@ -36,11 +36,11 @@ class FocalTestJournaldReporter(relbase.focal, TestJournaldReporter): | |||
253 | 36 | __test__ = True | 36 | __test__ = True |
254 | 37 | 37 | ||
255 | 38 | 38 | ||
257 | 39 | class HirsuteTestJournaldReporter(relbase.hirsute, TestJournaldReporter): | 39 | class JammyTestJournaldReporter(relbase.jammy, TestJournaldReporter): |
258 | 40 | __test__ = True | 40 | __test__ = True |
259 | 41 | 41 | ||
260 | 42 | 42 | ||
262 | 43 | class ImpishTestJournaldReporter(relbase.impish, TestJournaldReporter): | 43 | class ManticTestJournaldReporter(relbase.mantic, TestJournaldReporter): |
263 | 44 | __test__ = True | 44 | __test__ = True |
264 | 45 | 45 | ||
265 | 46 | 46 | ||
266 | diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py | |||
267 | index a0ce90d..052d339 100644 | |||
268 | --- a/tests/vmtests/test_lvm.py | |||
269 | +++ b/tests/vmtests/test_lvm.py | |||
270 | @@ -81,11 +81,11 @@ class FocalTestLvm(relbase.focal, TestLvmAbs): | |||
271 | 81 | __test__ = True | 81 | __test__ = True |
272 | 82 | 82 | ||
273 | 83 | 83 | ||
275 | 84 | class HirsuteTestLvm(relbase.hirsute, TestLvmAbs): | 84 | class JammyTestLvm(relbase.jammy, TestLvmAbs): |
276 | 85 | __test__ = True | 85 | __test__ = True |
277 | 86 | 86 | ||
278 | 87 | 87 | ||
280 | 88 | class ImpishTestLvm(relbase.impish, TestLvmAbs): | 88 | class ManticTestLvm(relbase.mantic, TestLvmAbs): |
281 | 89 | __test__ = True | 89 | __test__ = True |
282 | 90 | 90 | ||
283 | 91 | 91 | ||
284 | diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py | |||
285 | index 463d863..76117c1 100644 | |||
286 | --- a/tests/vmtests/test_lvm_iscsi.py | |||
287 | +++ b/tests/vmtests/test_lvm_iscsi.py | |||
288 | @@ -99,11 +99,11 @@ class FocalTestIscsiLvm(relbase.focal, TestLvmIscsiAbs): | |||
289 | 99 | __test__ = True | 99 | __test__ = True |
290 | 100 | 100 | ||
291 | 101 | 101 | ||
293 | 102 | class HirsuteTestIscsiLvm(relbase.hirsute, TestLvmIscsiAbs): | 102 | class JammyTestIscsiLvm(relbase.jammy, TestLvmIscsiAbs): |
294 | 103 | __test__ = True | 103 | __test__ = True |
295 | 104 | 104 | ||
296 | 105 | 105 | ||
298 | 106 | class ImpishTestIscsiLvm(relbase.impish, TestLvmIscsiAbs): | 106 | class ManticTestIscsiLvm(relbase.mantic, TestLvmIscsiAbs): |
299 | 107 | __test__ = True | 107 | __test__ = True |
300 | 108 | 108 | ||
301 | 109 | 109 | ||
302 | diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py | |||
303 | index 650fc25..d9eb9ff 100644 | |||
304 | --- a/tests/vmtests/test_lvm_raid.py | |||
305 | +++ b/tests/vmtests/test_lvm_raid.py | |||
306 | @@ -59,9 +59,12 @@ class FocalTestLvmOverRaid(relbase.focal, TestLvmOverRaidAbs): | |||
307 | 59 | __test__ = True | 59 | __test__ = True |
308 | 60 | 60 | ||
309 | 61 | 61 | ||
311 | 62 | class HirsuteTestLvmOverRaid(relbase.hirsute, TestLvmOverRaidAbs): | 62 | class JammyTestLvmOverRaid(relbase.jammy, TestLvmOverRaidAbs): |
312 | 63 | __test__ = True | 63 | __test__ = True |
313 | 64 | 64 | ||
314 | 65 | 65 | ||
316 | 66 | class ImpishTestLvmOverRaid(relbase.impish, TestLvmOverRaidAbs): | 66 | class ManticTestLvmOverRaid(relbase.mantic, TestLvmOverRaidAbs): |
317 | 67 | __test__ = True | 67 | __test__ = True |
318 | 68 | |||
319 | 69 | |||
320 | 70 | # vi: ts=4 expandtab syntax=python | ||
321 | diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py | |||
322 | index bc09e8d..3d14a2b 100644 | |||
323 | --- a/tests/vmtests/test_lvm_root.py | |||
324 | +++ b/tests/vmtests/test_lvm_root.py | |||
325 | @@ -94,14 +94,14 @@ class FocalTestLvmRootExt4(relbase.focal, TestLvmRootAbs): | |||
326 | 94 | } | 94 | } |
327 | 95 | 95 | ||
328 | 96 | 96 | ||
330 | 97 | class HirsuteTestLvmRootExt4(relbase.hirsute, TestLvmRootAbs): | 97 | class JammyTestLvmRootExt4(relbase.jammy, TestLvmRootAbs): |
331 | 98 | __test__ = True | 98 | __test__ = True |
332 | 99 | conf_replace = { | 99 | conf_replace = { |
333 | 100 | '__ROOTFS_FORMAT__': 'ext4', | 100 | '__ROOTFS_FORMAT__': 'ext4', |
334 | 101 | } | 101 | } |
335 | 102 | 102 | ||
336 | 103 | 103 | ||
338 | 104 | class ImpishTestLvmRootExt4(relbase.impish, TestLvmRootAbs): | 104 | class ManticTestLvmRootExt4(relbase.mantic, TestLvmRootAbs): |
339 | 105 | __test__ = True | 105 | __test__ = True |
340 | 106 | conf_replace = { | 106 | conf_replace = { |
341 | 107 | '__ROOTFS_FORMAT__': 'ext4', | 107 | '__ROOTFS_FORMAT__': 'ext4', |
342 | @@ -154,7 +154,7 @@ class FocalTestUefiLvmRootExt4(relbase.focal, TestUefiLvmRootAbs): | |||
343 | 154 | } | 154 | } |
344 | 155 | 155 | ||
345 | 156 | 156 | ||
347 | 157 | class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs): | 157 | class JammyTestUefiLvmRootExt4(relbase.jammy, TestUefiLvmRootAbs): |
348 | 158 | __test__ = True | 158 | __test__ = True |
349 | 159 | conf_replace = { | 159 | conf_replace = { |
350 | 160 | '__BOOTFS_FORMAT__': 'ext4', | 160 | '__BOOTFS_FORMAT__': 'ext4', |
351 | @@ -162,7 +162,7 @@ class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs): | |||
352 | 162 | } | 162 | } |
353 | 163 | 163 | ||
354 | 164 | 164 | ||
356 | 165 | class ImpishTestUefiLvmRootExt4(relbase.impish, TestUefiLvmRootAbs): | 165 | class ManticTestUefiLvmRootExt4(relbase.mantic, TestUefiLvmRootAbs): |
357 | 166 | __test__ = True | 166 | __test__ = True |
358 | 167 | conf_replace = { | 167 | conf_replace = { |
359 | 168 | '__BOOTFS_FORMAT__': 'ext4', | 168 | '__BOOTFS_FORMAT__': 'ext4', |
360 | diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py | |||
361 | index d90f478..95c2d58 100644 | |||
362 | --- a/tests/vmtests/test_mdadm_bcache.py | |||
363 | +++ b/tests/vmtests/test_mdadm_bcache.py | |||
364 | @@ -158,11 +158,11 @@ class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs): | |||
365 | 158 | __test__ = True | 158 | __test__ = True |
366 | 159 | 159 | ||
367 | 160 | 160 | ||
369 | 161 | class HirsuteTestMdadmBcache(relbase.hirsute, TestMdadmBcacheAbs): | 161 | class JammyTestMdadmBcache(relbase.jammy, TestMdadmBcacheAbs): |
370 | 162 | __test__ = True | 162 | __test__ = True |
371 | 163 | 163 | ||
372 | 164 | 164 | ||
374 | 165 | class ImpishTestMdadmBcache(relbase.impish, TestMdadmBcacheAbs): | 165 | class ManticTestMdadmBcache(relbase.mantic, TestMdadmBcacheAbs): |
375 | 166 | __test__ = True | 166 | __test__ = True |
376 | 167 | 167 | ||
377 | 168 | 168 | ||
378 | @@ -207,11 +207,11 @@ class FocalTestMirrorboot(relbase.focal, TestMirrorbootAbs): | |||
379 | 207 | __test__ = True | 207 | __test__ = True |
380 | 208 | 208 | ||
381 | 209 | 209 | ||
383 | 210 | class HirsuteTestMirrorboot(relbase.hirsute, TestMirrorbootAbs): | 210 | class JammyTestMirrorboot(relbase.jammy, TestMirrorbootAbs): |
384 | 211 | __test__ = True | 211 | __test__ = True |
385 | 212 | 212 | ||
386 | 213 | 213 | ||
388 | 214 | class ImpishTestMirrorboot(relbase.impish, TestMirrorbootAbs): | 214 | class ManticTestMirrorboot(relbase.mantic, TestMirrorbootAbs): |
389 | 215 | __test__ = True | 215 | __test__ = True |
390 | 216 | 216 | ||
391 | 217 | 217 | ||
392 | @@ -260,12 +260,12 @@ class FocalTestMirrorbootPartitions(relbase.focal, | |||
393 | 260 | __test__ = True | 260 | __test__ = True |
394 | 261 | 261 | ||
395 | 262 | 262 | ||
398 | 263 | class HirsuteTestMirrorbootPartitions(relbase.hirsute, | 263 | class JammyTestMirrorbootPartitions(relbase.jammy, |
399 | 264 | TestMirrorbootPartitionsAbs): | 264 | TestMirrorbootPartitionsAbs): |
400 | 265 | __test__ = True | 265 | __test__ = True |
401 | 266 | 266 | ||
402 | 267 | 267 | ||
404 | 268 | class ImpishTestMirrorbootPartitions(relbase.impish, | 268 | class ManticTestMirrorbootPartitions(relbase.mantic, |
405 | 269 | TestMirrorbootPartitionsAbs): | 269 | TestMirrorbootPartitionsAbs): |
406 | 270 | __test__ = True | 270 | __test__ = True |
407 | 271 | 271 | ||
408 | @@ -360,12 +360,12 @@ class FocalTestMirrorbootPartitionsUEFI(relbase.focal, | |||
409 | 360 | __test__ = True | 360 | __test__ = True |
410 | 361 | 361 | ||
411 | 362 | 362 | ||
414 | 363 | class HirsuteTestMirrorbootPartitionsUEFI(relbase.hirsute, | 363 | class JammyTestMirrorbootPartitionsUEFI(relbase.jammy, |
415 | 364 | TestMirrorbootPartitionsUEFIAbs): | 364 | TestMirrorbootPartitionsUEFIAbs): |
416 | 365 | __test__ = True | 365 | __test__ = True |
417 | 366 | 366 | ||
418 | 367 | 367 | ||
420 | 368 | class ImpishTestMirrorbootPartitionsUEFI(relbase.impish, | 368 | class ManticTestMirrorbootPartitionsUEFI(relbase.mantic, |
421 | 369 | TestMirrorbootPartitionsUEFIAbs): | 369 | TestMirrorbootPartitionsUEFIAbs): |
422 | 370 | __test__ = True | 370 | __test__ = True |
423 | 371 | 371 | ||
424 | @@ -414,11 +414,11 @@ class FocalTestRaid5boot(relbase.focal, TestRaid5bootAbs): | |||
425 | 414 | __test__ = True | 414 | __test__ = True |
426 | 415 | 415 | ||
427 | 416 | 416 | ||
429 | 417 | class HirsuteTestRaid5boot(relbase.hirsute, TestRaid5bootAbs): | 417 | class JammyTestRaid5boot(relbase.jammy, TestRaid5bootAbs): |
430 | 418 | __test__ = True | 418 | __test__ = True |
431 | 419 | 419 | ||
432 | 420 | 420 | ||
434 | 421 | class ImpishTestRaid5boot(relbase.impish, TestRaid5bootAbs): | 421 | class ManticTestRaid5boot(relbase.mantic, TestRaid5bootAbs): |
435 | 422 | __test__ = True | 422 | __test__ = True |
436 | 423 | 423 | ||
437 | 424 | 424 | ||
438 | @@ -479,11 +479,11 @@ class FocalTestRaid6boot(relbase.focal, TestRaid6bootAbs): | |||
439 | 479 | __test__ = True | 479 | __test__ = True |
440 | 480 | 480 | ||
441 | 481 | 481 | ||
443 | 482 | class HirsuteTestRaid6boot(relbase.hirsute, TestRaid6bootAbs): | 482 | class JammyTestRaid6boot(relbase.jammy, TestRaid6bootAbs): |
444 | 483 | __test__ = True | 483 | __test__ = True |
445 | 484 | 484 | ||
446 | 485 | 485 | ||
448 | 486 | class ImpishTestRaid6boot(relbase.impish, TestRaid6bootAbs): | 486 | class ManticTestRaid6boot(relbase.mantic, TestRaid6bootAbs): |
449 | 487 | __test__ = True | 487 | __test__ = True |
450 | 488 | 488 | ||
451 | 489 | 489 | ||
452 | @@ -530,11 +530,11 @@ class FocalTestRaid10boot(relbase.focal, TestRaid10bootAbs): | |||
453 | 530 | __test__ = True | 530 | __test__ = True |
454 | 531 | 531 | ||
455 | 532 | 532 | ||
457 | 533 | class HirsuteTestRaid10boot(relbase.hirsute, TestRaid10bootAbs): | 533 | class JammyTestRaid10boot(relbase.jammy, TestRaid10bootAbs): |
458 | 534 | __test__ = True | 534 | __test__ = True |
459 | 535 | 535 | ||
460 | 536 | 536 | ||
462 | 537 | class ImpishTestRaid10boot(relbase.impish, TestRaid10bootAbs): | 537 | class ManticTestRaid10boot(relbase.mantic, TestRaid10bootAbs): |
463 | 538 | __test__ = True | 538 | __test__ = True |
464 | 539 | 539 | ||
465 | 540 | 540 | ||
466 | @@ -638,11 +638,11 @@ class FocalTestAllindata(relbase.focal, TestAllindataAbs): | |||
467 | 638 | __test__ = True | 638 | __test__ = True |
468 | 639 | 639 | ||
469 | 640 | 640 | ||
471 | 641 | class HirsuteTestAllindata(relbase.hirsute, TestAllindataAbs): | 641 | class JammyTestAllindata(relbase.jammy, TestAllindataAbs): |
472 | 642 | __test__ = True | 642 | __test__ = True |
473 | 643 | 643 | ||
474 | 644 | 644 | ||
476 | 645 | class ImpishTestAllindata(relbase.impish, TestAllindataAbs): | 645 | class ManticTestAllindata(relbase.mantic, TestAllindataAbs): |
477 | 646 | __test__ = True | 646 | __test__ = True |
478 | 647 | 647 | ||
479 | 648 | 648 | ||
480 | diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py | |||
481 | index f6f0b22..7280082 100644 | |||
482 | --- a/tests/vmtests/test_mdadm_iscsi.py | |||
483 | +++ b/tests/vmtests/test_mdadm_iscsi.py | |||
484 | @@ -54,11 +54,11 @@ class FocalTestIscsiMdadm(relbase.focal, TestMdadmIscsiAbs): | |||
485 | 54 | __test__ = True | 54 | __test__ = True |
486 | 55 | 55 | ||
487 | 56 | 56 | ||
489 | 57 | class HirsuteTestIscsiMdadm(relbase.hirsute, TestMdadmIscsiAbs): | 57 | class JammyTestIscsiMdadm(relbase.jammy, TestMdadmIscsiAbs): |
490 | 58 | __test__ = True | 58 | __test__ = True |
491 | 59 | 59 | ||
492 | 60 | 60 | ||
494 | 61 | class ImpishTestIscsiMdadm(relbase.impish, TestMdadmIscsiAbs): | 61 | class ManticTestIscsiMdadm(relbase.mantic, TestMdadmIscsiAbs): |
495 | 62 | __test__ = True | 62 | __test__ = True |
496 | 63 | 63 | ||
497 | 64 | 64 | ||
498 | diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py | |||
499 | index ac85a58..28b5acd 100644 | |||
500 | --- a/tests/vmtests/test_multipath.py | |||
501 | +++ b/tests/vmtests/test_multipath.py | |||
502 | @@ -162,11 +162,11 @@ class FocalTestMultipathBasic(relbase.focal, TestMultipathBasicAbs): | |||
503 | 162 | __test__ = True | 162 | __test__ = True |
504 | 163 | 163 | ||
505 | 164 | 164 | ||
507 | 165 | class HirsuteTestMultipathBasic(relbase.hirsute, TestMultipathBasicAbs): | 165 | class JammyTestMultipathBasic(relbase.jammy, TestMultipathBasicAbs): |
508 | 166 | __test__ = True | 166 | __test__ = True |
509 | 167 | 167 | ||
510 | 168 | 168 | ||
512 | 169 | class ImpishTestMultipathBasic(relbase.impish, TestMultipathBasicAbs): | 169 | class ManticTestMultipathBasic(relbase.mantic, TestMultipathBasicAbs): |
513 | 170 | __test__ = True | 170 | __test__ = True |
514 | 171 | 171 | ||
515 | 172 | 172 | ||
516 | @@ -178,11 +178,11 @@ class FocalTestMultipathReuse(relbase.focal, TestMultipathReuseAbs): | |||
517 | 178 | __test__ = True | 178 | __test__ = True |
518 | 179 | 179 | ||
519 | 180 | 180 | ||
521 | 181 | class HirsuteTestMultipathReuse(relbase.hirsute, TestMultipathReuseAbs): | 181 | class JammyTestMultipathReuse(relbase.jammy, TestMultipathReuseAbs): |
522 | 182 | __test__ = True | 182 | __test__ = True |
523 | 183 | 183 | ||
524 | 184 | 184 | ||
526 | 185 | class ImpishTestMultipathReuse(relbase.impish, TestMultipathReuseAbs): | 185 | class ManticTestMultipathReuse(relbase.mantic, TestMultipathReuseAbs): |
527 | 186 | __test__ = True | 186 | __test__ = True |
528 | 187 | 187 | ||
529 | 188 | 188 | ||
530 | diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py | |||
531 | index 97d797e..1d60be7 100644 | |||
532 | --- a/tests/vmtests/test_multipath_lvm.py | |||
533 | +++ b/tests/vmtests/test_multipath_lvm.py | |||
534 | @@ -60,11 +60,11 @@ class FocalTestMultipathLvm(relbase.focal, TestMultipathLvmAbs): | |||
535 | 60 | __test__ = True | 60 | __test__ = True |
536 | 61 | 61 | ||
537 | 62 | 62 | ||
539 | 63 | class HirsuteTestMultipathLvm(relbase.hirsute, TestMultipathLvmAbs): | 63 | class JammyTestMultipathLvm(relbase.jammy, TestMultipathLvmAbs): |
540 | 64 | __test__ = True | 64 | __test__ = True |
541 | 65 | 65 | ||
542 | 66 | 66 | ||
544 | 67 | class ImpishTestMultipathLvm(relbase.impish, TestMultipathLvmAbs): | 67 | class ManticTestMultipathLvm(relbase.mantic, TestMultipathLvmAbs): |
545 | 68 | __test__ = True | 68 | __test__ = True |
546 | 69 | 69 | ||
547 | 70 | 70 | ||
548 | @@ -77,12 +77,12 @@ class FocalTestMultipathLvmPartWipe(relbase.focal, | |||
549 | 77 | __test__ = True | 77 | __test__ = True |
550 | 78 | 78 | ||
551 | 79 | 79 | ||
554 | 80 | class HirsuteTestMultipathLvmPartWipe(relbase.hirsute, | 80 | class JammyTestMultipathLvmPartWipe(relbase.jammy, |
555 | 81 | TestMultipathLvmPartWipeAbs): | 81 | TestMultipathLvmPartWipeAbs): |
556 | 82 | __test__ = True | 82 | __test__ = True |
557 | 83 | 83 | ||
558 | 84 | 84 | ||
560 | 85 | class ImpishTestMultipathLvmPartWipe(relbase.impish, | 85 | class ManticTestMultipathLvmPartWipe(relbase.mantic, |
561 | 86 | TestMultipathLvmPartWipeAbs): | 86 | TestMultipathLvmPartWipeAbs): |
562 | 87 | __test__ = True | 87 | __test__ = True |
563 | 88 | 88 | ||
564 | diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py | |||
565 | index 6ff3a16..e838934 100644 | |||
566 | --- a/tests/vmtests/test_network.py | |||
567 | +++ b/tests/vmtests/test_network.py | |||
568 | @@ -478,11 +478,11 @@ class FocalTestNetworkBasic(relbase.focal, TestNetworkBasicAbs): | |||
569 | 478 | __test__ = True | 478 | __test__ = True |
570 | 479 | 479 | ||
571 | 480 | 480 | ||
573 | 481 | class HirsuteTestNetworkBasic(relbase.hirsute, TestNetworkBasicAbs): | 481 | class JammyTestNetworkBasic(relbase.jammy, TestNetworkBasicAbs): |
574 | 482 | __test__ = True | 482 | __test__ = True |
575 | 483 | 483 | ||
576 | 484 | 484 | ||
578 | 485 | class ImpishTestNetworkBasic(relbase.impish, TestNetworkBasicAbs): | 485 | class ManticTestNetworkBasic(relbase.mantic, TestNetworkBasicAbs): |
579 | 486 | __test__ = True | 486 | __test__ = True |
580 | 487 | 487 | ||
581 | 488 | 488 | ||
582 | diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py | |||
583 | index dd6ba02..1570c8f 100644 | |||
584 | --- a/tests/vmtests/test_network_alias.py | |||
585 | +++ b/tests/vmtests/test_network_alias.py | |||
586 | @@ -51,11 +51,11 @@ class FocalTestNetworkAlias(relbase.focal, TestNetworkAliasAbs): | |||
587 | 51 | __test__ = True | 51 | __test__ = True |
588 | 52 | 52 | ||
589 | 53 | 53 | ||
591 | 54 | class HirsuteTestNetworkAlias(relbase.hirsute, TestNetworkAliasAbs): | 54 | class JammyTestNetworkAlias(relbase.jammy, TestNetworkAliasAbs): |
592 | 55 | __test__ = True | 55 | __test__ = True |
593 | 56 | 56 | ||
594 | 57 | 57 | ||
596 | 58 | class ImpishTestNetworkAlias(relbase.impish, TestNetworkAliasAbs): | 58 | class ManticTestNetworkAlias(relbase.mantic, TestNetworkAliasAbs): |
597 | 59 | __test__ = True | 59 | __test__ = True |
598 | 60 | 60 | ||
599 | 61 | 61 | ||
600 | diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py | |||
601 | index ad0c1d4..fb91179 100644 | |||
602 | --- a/tests/vmtests/test_network_bonding.py | |||
603 | +++ b/tests/vmtests/test_network_bonding.py | |||
604 | @@ -61,11 +61,11 @@ class FocalTestBonding(relbase.focal, TestNetworkBondingAbs): | |||
605 | 61 | __test__ = True | 61 | __test__ = True |
606 | 62 | 62 | ||
607 | 63 | 63 | ||
609 | 64 | class HirsuteTestBonding(relbase.hirsute, TestNetworkBondingAbs): | 64 | class JammyTestBonding(relbase.jammy, TestNetworkBondingAbs): |
610 | 65 | __test__ = True | 65 | __test__ = True |
611 | 66 | 66 | ||
612 | 67 | 67 | ||
614 | 68 | class ImpishTestBonding(relbase.impish, TestNetworkBondingAbs): | 68 | class ManticTestBonding(relbase.mantic, TestNetworkBondingAbs): |
615 | 69 | __test__ = True | 69 | __test__ = True |
616 | 70 | 70 | ||
617 | 71 | 71 | ||
618 | diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py | |||
619 | index 9c90702..a46841f 100644 | |||
620 | --- a/tests/vmtests/test_network_bridging.py | |||
621 | +++ b/tests/vmtests/test_network_bridging.py | |||
622 | @@ -233,11 +233,11 @@ class FocalTestBridging(relbase.focal, TestBridgeNetworkAbs): | |||
623 | 233 | __test__ = True | 233 | __test__ = True |
624 | 234 | 234 | ||
625 | 235 | 235 | ||
627 | 236 | class HirsuteTestBridging(relbase.hirsute, TestBridgeNetworkAbs): | 236 | class JammyTestBridging(relbase.jammy, TestBridgeNetworkAbs): |
628 | 237 | __test__ = True | 237 | __test__ = True |
629 | 238 | 238 | ||
630 | 239 | 239 | ||
632 | 240 | class ImpishTestBridging(relbase.impish, TestBridgeNetworkAbs): | 240 | class ManticTestBridging(relbase.mantic, TestBridgeNetworkAbs): |
633 | 241 | __test__ = True | 241 | __test__ = True |
634 | 242 | 242 | ||
635 | 243 | 243 | ||
636 | diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py | |||
637 | index d56ebde..3494d38 100644 | |||
638 | --- a/tests/vmtests/test_network_disabled.py | |||
639 | +++ b/tests/vmtests/test_network_disabled.py | |||
640 | @@ -63,37 +63,37 @@ class FocalCurtinDisableNetworkRendering(relbase.focal, TestKlass1): | |||
641 | 63 | __test__ = True | 63 | __test__ = True |
642 | 64 | 64 | ||
643 | 65 | 65 | ||
645 | 66 | class HirsuteCurtinDisableNetworkRendering(relbase.hirsute, TestKlass1): | 66 | class FocalCurtinDisableCloudInitNetworking(relbase.focal, TestKlass2): |
646 | 67 | __test__ = True | 67 | __test__ = True |
647 | 68 | 68 | ||
648 | 69 | 69 | ||
650 | 70 | class ImpishCurtinDisableNetworkRendering(relbase.impish, TestKlass1): | 70 | class FocalCurtinDisableCloudInitNetworkingVersion1(relbase.focal, TestKlass3): |
651 | 71 | __test__ = True | 71 | __test__ = True |
652 | 72 | 72 | ||
653 | 73 | 73 | ||
655 | 74 | class FocalCurtinDisableCloudInitNetworking(relbase.focal, TestKlass2): | 74 | class JammyCurtinDisableNetworkRendering(relbase.jammy, TestKlass1): |
656 | 75 | __test__ = True | 75 | __test__ = True |
657 | 76 | 76 | ||
658 | 77 | 77 | ||
660 | 78 | class HirsuteCurtinDisableCloudInitNetworking(relbase.hirsute, TestKlass2): | 78 | class JammyCurtinDisableCloudInitNetworking(relbase.jammy, TestKlass2): |
661 | 79 | __test__ = True | 79 | __test__ = True |
662 | 80 | 80 | ||
663 | 81 | 81 | ||
665 | 82 | class ImpishCurtinDisableCloudInitNetworking(relbase.impish, TestKlass2): | 82 | class JammyCurtinDisableCloudInitNetworkingVersion1(relbase.jammy, TestKlass3): |
666 | 83 | __test__ = True | 83 | __test__ = True |
667 | 84 | 84 | ||
668 | 85 | 85 | ||
670 | 86 | class FocalCurtinDisableCloudInitNetworkingVersion1(relbase.focal, TestKlass3): | 86 | class ManticCurtinDisableNetworkRendering(relbase.mantic, TestKlass1): |
671 | 87 | __test__ = True | 87 | __test__ = True |
672 | 88 | 88 | ||
673 | 89 | 89 | ||
676 | 90 | class HirsuteCurtinDisableCloudInitNetworkingVersion1(relbase.hirsute, | 90 | class ManticCurtinDisableCloudInitNetworking(relbase.mantic, TestKlass2): |
675 | 91 | TestKlass3): | ||
677 | 92 | __test__ = True | 91 | __test__ = True |
678 | 93 | 92 | ||
679 | 94 | 93 | ||
682 | 95 | class ImpishCurtinDisableCloudInitNetworkingVersion1(relbase.impish, | 94 | class ManticCurtinDisableCloudInitNetworkingVersion1( |
683 | 96 | TestKlass3): | 95 | relbase.mantic, TestKlass3 |
684 | 96 | ): | ||
685 | 97 | __test__ = True | 97 | __test__ = True |
686 | 98 | 98 | ||
687 | 99 | 99 | ||
688 | diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py | |||
689 | index f524e82..5b96b16 100644 | |||
690 | --- a/tests/vmtests/test_network_ipv6.py | |||
691 | +++ b/tests/vmtests/test_network_ipv6.py | |||
692 | @@ -57,11 +57,11 @@ class FocalTestNetworkIPV6(relbase.focal, TestNetworkIPV6Abs): | |||
693 | 57 | __test__ = True | 57 | __test__ = True |
694 | 58 | 58 | ||
695 | 59 | 59 | ||
697 | 60 | class HirsuteTestNetworkIPV6(relbase.hirsute, TestNetworkIPV6Abs): | 60 | class JammyTestNetworkIPV6(relbase.jammy, TestNetworkIPV6Abs): |
698 | 61 | __test__ = True | 61 | __test__ = True |
699 | 62 | 62 | ||
700 | 63 | 63 | ||
702 | 64 | class ImpishTestNetworkIPV6(relbase.impish, TestNetworkIPV6Abs): | 64 | class ManticTestNetworkIPV6(relbase.mantic, TestNetworkIPV6Abs): |
703 | 65 | __test__ = True | 65 | __test__ = True |
704 | 66 | 66 | ||
705 | 67 | 67 | ||
706 | diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py | |||
707 | index cb9caad..8e070e8 100644 | |||
708 | --- a/tests/vmtests/test_network_ipv6_static.py | |||
709 | +++ b/tests/vmtests/test_network_ipv6_static.py | |||
710 | @@ -27,11 +27,11 @@ class FocalTestNetworkIPV6Static(relbase.focal, TestNetworkIPV6StaticAbs): | |||
711 | 27 | __test__ = True | 27 | __test__ = True |
712 | 28 | 28 | ||
713 | 29 | 29 | ||
715 | 30 | class HirsuteTestNetworkIPV6Static(relbase.hirsute, TestNetworkIPV6StaticAbs): | 30 | class JammyTestNetworkIPV6Static(relbase.jammy, TestNetworkIPV6StaticAbs): |
716 | 31 | __test__ = True | 31 | __test__ = True |
717 | 32 | 32 | ||
718 | 33 | 33 | ||
720 | 34 | class ImpishTestNetworkIPV6Static(relbase.impish, TestNetworkIPV6StaticAbs): | 34 | class ManticTestNetworkIPV6Static(relbase.mantic, TestNetworkIPV6StaticAbs): |
721 | 35 | __test__ = True | 35 | __test__ = True |
722 | 36 | 36 | ||
723 | 37 | 37 | ||
724 | diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py | |||
725 | index 7955101..0e7e302 100644 | |||
726 | --- a/tests/vmtests/test_network_ipv6_vlan.py | |||
727 | +++ b/tests/vmtests/test_network_ipv6_vlan.py | |||
728 | @@ -26,11 +26,11 @@ class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs): | |||
729 | 26 | __test__ = True | 26 | __test__ = True |
730 | 27 | 27 | ||
731 | 28 | 28 | ||
733 | 29 | class HirsuteTestNetworkIPV6Vlan(relbase.hirsute, TestNetworkIPV6VlanAbs): | 29 | class JammyTestNetworkIPV6Vlan(relbase.jammy, TestNetworkIPV6VlanAbs): |
734 | 30 | __test__ = True | 30 | __test__ = True |
735 | 31 | 31 | ||
736 | 32 | 32 | ||
738 | 33 | class ImpishTestNetworkIPV6Vlan(relbase.impish, TestNetworkIPV6VlanAbs): | 33 | class ManticTestNetworkIPV6Vlan(relbase.mantic, TestNetworkIPV6VlanAbs): |
739 | 34 | __test__ = True | 34 | __test__ = True |
740 | 35 | 35 | ||
741 | 36 | 36 | ||
742 | diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py | |||
743 | index f112b1c..7aff7b2 100644 | |||
744 | --- a/tests/vmtests/test_network_mtu.py | |||
745 | +++ b/tests/vmtests/test_network_mtu.py | |||
746 | @@ -193,11 +193,11 @@ class FocalTestNetworkMtu(relbase.focal, TestNetworkMtuNetworkdAbs): | |||
747 | 193 | __test__ = True | 193 | __test__ = True |
748 | 194 | 194 | ||
749 | 195 | 195 | ||
751 | 196 | class HirsuteTestNetworkMtu(relbase.hirsute, TestNetworkMtuNetworkdAbs): | 196 | class JammyTestNetworkMtu(relbase.jammy, TestNetworkMtuNetworkdAbs): |
752 | 197 | __test__ = True | 197 | __test__ = True |
753 | 198 | 198 | ||
754 | 199 | 199 | ||
756 | 200 | class ImpishTestNetworkMtu(relbase.impish, TestNetworkMtuNetworkdAbs): | 200 | class ManticTestNetworkMtu(relbase.mantic, TestNetworkMtuNetworkdAbs): |
757 | 201 | __test__ = True | 201 | __test__ = True |
758 | 202 | 202 | ||
759 | 203 | 203 | ||
760 | diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py | |||
761 | index 3e8699d..d6e23c8 100644 | |||
762 | --- a/tests/vmtests/test_network_ovs.py | |||
763 | +++ b/tests/vmtests/test_network_ovs.py | |||
764 | @@ -38,11 +38,11 @@ class FocalTestNetworkOvs(relbase.focal, TestNetworkOvsAbs): | |||
765 | 38 | __test__ = True | 38 | __test__ = True |
766 | 39 | 39 | ||
767 | 40 | 40 | ||
769 | 41 | class HirsuteTestNetworkOvs(relbase.hirsute, TestNetworkOvsAbs): | 41 | class JammyTestNetworkOvs(relbase.jammy, TestNetworkOvsAbs): |
770 | 42 | __test__ = True | 42 | __test__ = True |
771 | 43 | 43 | ||
772 | 44 | 44 | ||
774 | 45 | class ImpishTestNetworkOvs(relbase.impish, TestNetworkOvsAbs): | 45 | class ManticTestNetworkOvs(relbase.mantic, TestNetworkOvsAbs): |
775 | 46 | __test__ = True | 46 | __test__ = True |
776 | 47 | 47 | ||
777 | 48 | 48 | ||
778 | diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py | |||
779 | index 867cf11..9a2adb3 100644 | |||
780 | --- a/tests/vmtests/test_network_static.py | |||
781 | +++ b/tests/vmtests/test_network_static.py | |||
782 | @@ -32,11 +32,11 @@ class FocalTestNetworkStatic(relbase.focal, TestNetworkStaticAbs): | |||
783 | 32 | __test__ = True | 32 | __test__ = True |
784 | 33 | 33 | ||
785 | 34 | 34 | ||
787 | 35 | class HirsuteTestNetworkStatic(relbase.hirsute, TestNetworkStaticAbs): | 35 | class JammyTestNetworkStatic(relbase.jammy, TestNetworkStaticAbs): |
788 | 36 | __test__ = True | 36 | __test__ = True |
789 | 37 | 37 | ||
790 | 38 | 38 | ||
792 | 39 | class ImpishTestNetworkStatic(relbase.impish, TestNetworkStaticAbs): | 39 | class ManticTestNetworkStatic(relbase.mantic, TestNetworkStaticAbs): |
793 | 40 | __test__ = True | 40 | __test__ = True |
794 | 41 | 41 | ||
795 | 42 | 42 | ||
796 | diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py | |||
797 | index 664c035..8ddeeaf 100644 | |||
798 | --- a/tests/vmtests/test_network_static_routes.py | |||
799 | +++ b/tests/vmtests/test_network_static_routes.py | |||
800 | @@ -33,12 +33,12 @@ class FocalTestNetworkStaticRoutes(relbase.focal, | |||
801 | 33 | __test__ = True | 33 | __test__ = True |
802 | 34 | 34 | ||
803 | 35 | 35 | ||
806 | 36 | class HirsuteTestNetworkStaticRoutes(relbase.hirsute, | 36 | class JammyTestNetworkStaticRoutes(relbase.jammy, |
807 | 37 | TestNetworkStaticRoutesAbs): | 37 | TestNetworkStaticRoutesAbs): |
808 | 38 | __test__ = True | 38 | __test__ = True |
809 | 39 | 39 | ||
810 | 40 | 40 | ||
812 | 41 | class ImpishTestNetworkStaticRoutes(relbase.impish, | 41 | class ManticTestNetworkStaticRoutes(relbase.mantic, |
813 | 42 | TestNetworkStaticRoutesAbs): | 42 | TestNetworkStaticRoutesAbs): |
814 | 43 | __test__ = True | 43 | __test__ = True |
815 | 44 | 44 | ||
816 | diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py | |||
817 | index 99bad66..6fca423 100644 | |||
818 | --- a/tests/vmtests/test_network_vlan.py | |||
819 | +++ b/tests/vmtests/test_network_vlan.py | |||
820 | @@ -80,11 +80,11 @@ class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs): | |||
821 | 80 | __test__ = True | 80 | __test__ = True |
822 | 81 | 81 | ||
823 | 82 | 82 | ||
825 | 83 | class HirsuteTestNetworkVlan(relbase.hirsute, TestNetworkVlanAbs): | 83 | class JammyTestNetworkVlan(relbase.jammy, TestNetworkVlanAbs): |
826 | 84 | __test__ = True | 84 | __test__ = True |
827 | 85 | 85 | ||
828 | 86 | 86 | ||
830 | 87 | class ImpishTestNetworkVlan(relbase.impish, TestNetworkVlanAbs): | 87 | class ManticTestNetworkVlan(relbase.mantic, TestNetworkVlanAbs): |
831 | 88 | __test__ = True | 88 | __test__ = True |
832 | 89 | 89 | ||
833 | 90 | 90 | ||
834 | diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py | |||
835 | index 6352f6d..d458fca 100644 | |||
836 | --- a/tests/vmtests/test_nvme.py | |||
837 | +++ b/tests/vmtests/test_nvme.py | |||
838 | @@ -79,12 +79,16 @@ class FocalTestNvme(relbase.focal, TestNvmeAbs): | |||
839 | 79 | # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha' | 79 | # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha' |
840 | 80 | 80 | ||
841 | 81 | 81 | ||
843 | 82 | class HirsuteTestNvme(relbase.hirsute, TestNvmeAbs): | 82 | class JammyTestNvme(relbase.jammy, TestNvmeAbs): |
844 | 83 | __test__ = False | 83 | __test__ = False |
845 | 84 | # An error occured handling 'nvme_disk2': | ||
846 | 85 | # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha' | ||
847 | 84 | 86 | ||
848 | 85 | 87 | ||
850 | 86 | class ImpishTestNvme(relbase.impish, TestNvmeAbs): | 88 | class ManticTestNvme(relbase.mantic, TestNvmeAbs): |
851 | 87 | __test__ = False | 89 | __test__ = False |
852 | 90 | # An error occured handling 'nvme_disk2': | ||
853 | 91 | # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha' | ||
854 | 88 | 92 | ||
855 | 89 | 93 | ||
856 | 90 | class TestNvmeBcacheAbs(TestNvmeAbs): | 94 | class TestNvmeBcacheAbs(TestNvmeAbs): |
857 | @@ -153,11 +157,11 @@ class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs): | |||
858 | 153 | __test__ = True | 157 | __test__ = True |
859 | 154 | 158 | ||
860 | 155 | 159 | ||
862 | 156 | class HirsuteTestNvmeBcache(relbase.hirsute, TestNvmeBcacheAbs): | 160 | class JammyTestNvmeBcache(relbase.jammy, TestNvmeBcacheAbs): |
863 | 157 | __test__ = True | 161 | __test__ = True |
864 | 158 | 162 | ||
865 | 159 | 163 | ||
867 | 160 | class ImpishTestNvmeBcache(relbase.impish, TestNvmeBcacheAbs): | 164 | class ManticTestNvmeBcache(relbase.mantic, TestNvmeBcacheAbs): |
868 | 161 | __test__ = True | 165 | __test__ = True |
869 | 162 | 166 | ||
870 | 163 | 167 | ||
871 | diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py | |||
872 | index a5533f9..d3861e3 100644 | |||
873 | --- a/tests/vmtests/test_panic.py | |||
874 | +++ b/tests/vmtests/test_panic.py | |||
875 | @@ -29,11 +29,11 @@ class FocalTestInstallPanic(relbase.focal, TestInstallPanic): | |||
876 | 29 | __test__ = True | 29 | __test__ = True |
877 | 30 | 30 | ||
878 | 31 | 31 | ||
880 | 32 | class HirsuteTestInstallPanic(relbase.hirsute, TestInstallPanic): | 32 | class JammyTestInstallPanic(relbase.jammy, TestInstallPanic): |
881 | 33 | __test__ = True | 33 | __test__ = True |
882 | 34 | 34 | ||
883 | 35 | 35 | ||
885 | 36 | class ImpishTestInstallPanic(relbase.impish, TestInstallPanic): | 36 | class ManticTestInstallPanic(relbase.mantic, TestInstallPanic): |
886 | 37 | __test__ = True | 37 | __test__ = True |
887 | 38 | 38 | ||
888 | 39 | 39 | ||
889 | diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py | |||
890 | index fa33ec5..3215142 100644 | |||
891 | --- a/tests/vmtests/test_pollinate_useragent.py | |||
892 | +++ b/tests/vmtests/test_pollinate_useragent.py | |||
893 | @@ -65,11 +65,11 @@ class FocalTestPollinateUserAgent(relbase.focal, TestPollinateUserAgent): | |||
894 | 65 | __test__ = True | 65 | __test__ = True |
895 | 66 | 66 | ||
896 | 67 | 67 | ||
898 | 68 | class HirsuteTestPollinateUserAgent(relbase.hirsute, TestPollinateUserAgent): | 68 | class JammyTestPollinateUserAgent(relbase.jammy, TestPollinateUserAgent): |
899 | 69 | __test__ = True | 69 | __test__ = True |
900 | 70 | 70 | ||
901 | 71 | 71 | ||
903 | 72 | class ImpishTestPollinateUserAgent(relbase.impish, TestPollinateUserAgent): | 72 | class ManticTestPollinateUserAgent(relbase.mantic, TestPollinateUserAgent): |
904 | 73 | __test__ = True | 73 | __test__ = True |
905 | 74 | 74 | ||
906 | 75 | 75 | ||
907 | diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py | |||
908 | index 74fe29e..4fbf832 100644 | |||
909 | --- a/tests/vmtests/test_preserve.py | |||
910 | +++ b/tests/vmtests/test_preserve.py | |||
911 | @@ -29,11 +29,11 @@ class FocalTestPreserve(relbase.focal, TestPreserve): | |||
912 | 29 | __test__ = True | 29 | __test__ = True |
913 | 30 | 30 | ||
914 | 31 | 31 | ||
916 | 32 | class HirsuteTestPreserve(relbase.hirsute, TestPreserve): | 32 | class JammyTestPreserve(relbase.jammy, TestPreserve): |
917 | 33 | __test__ = True | 33 | __test__ = True |
918 | 34 | 34 | ||
919 | 35 | 35 | ||
921 | 36 | class ImpishTestPreserve(relbase.impish, TestPreserve): | 36 | class ManticTestPreserve(relbase.mantic, TestPreserve): |
922 | 37 | __test__ = True | 37 | __test__ = True |
923 | 38 | 38 | ||
924 | 39 | 39 | ||
925 | diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py | |||
926 | index 46edd3f..23e4dee 100644 | |||
927 | --- a/tests/vmtests/test_preserve_bcache.py | |||
928 | +++ b/tests/vmtests/test_preserve_bcache.py | |||
929 | @@ -60,11 +60,11 @@ class FocalTestPreserveBcache(relbase.focal, TestPreserveBcache): | |||
930 | 60 | __test__ = True | 60 | __test__ = True |
931 | 61 | 61 | ||
932 | 62 | 62 | ||
934 | 63 | class HirsuteTestPreserveBcache(relbase.hirsute, TestPreserveBcache): | 63 | class JammyTestPreserveBcache(relbase.jammy, TestPreserveBcache): |
935 | 64 | __test__ = True | 64 | __test__ = True |
936 | 65 | 65 | ||
937 | 66 | 66 | ||
939 | 67 | class ImpishTestPreserveBcache(relbase.impish, TestPreserveBcache): | 67 | class ManticTestPreserveBcache(relbase.mantic, TestPreserveBcache): |
940 | 68 | __test__ = True | 68 | __test__ = True |
941 | 69 | 69 | ||
942 | 70 | 70 | ||
943 | diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py | |||
944 | index 0c09c11..4b5401d 100644 | |||
945 | --- a/tests/vmtests/test_preserve_lvm.py | |||
946 | +++ b/tests/vmtests/test_preserve_lvm.py | |||
947 | @@ -73,11 +73,11 @@ class FocalTestLvmPreserve(relbase.focal, TestLvmPreserveAbs): | |||
948 | 73 | __test__ = True | 73 | __test__ = True |
949 | 74 | 74 | ||
950 | 75 | 75 | ||
952 | 76 | class HirsuteTestLvmPreserve(relbase.hirsute, TestLvmPreserveAbs): | 76 | class JammyTestLvmPreserve(relbase.jammy, TestLvmPreserveAbs): |
953 | 77 | __test__ = True | 77 | __test__ = True |
954 | 78 | 78 | ||
955 | 79 | 79 | ||
957 | 80 | class ImpishTestLvmPreserve(relbase.impish, TestLvmPreserveAbs): | 80 | class ManticTestLvmPreserve(relbase.mantic, TestLvmPreserveAbs): |
958 | 81 | __test__ = True | 81 | __test__ = True |
959 | 82 | 82 | ||
960 | 83 | 83 | ||
961 | diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py | |||
962 | index 4db6c2b..e9759bf 100644 | |||
963 | --- a/tests/vmtests/test_preserve_partition_wipe_vg.py | |||
964 | +++ b/tests/vmtests/test_preserve_partition_wipe_vg.py | |||
965 | @@ -29,11 +29,11 @@ class FocalTestPreserveWipeLvm(relbase.focal, TestPreserveWipeLvm): | |||
966 | 29 | __test__ = True | 29 | __test__ = True |
967 | 30 | 30 | ||
968 | 31 | 31 | ||
970 | 32 | class HirsuteTestPreserveWipeLvm(relbase.hirsute, TestPreserveWipeLvm): | 32 | class JammyTestPreserveWipeLvm(relbase.jammy, TestPreserveWipeLvm): |
971 | 33 | __test__ = True | 33 | __test__ = True |
972 | 34 | 34 | ||
973 | 35 | 35 | ||
975 | 36 | class ImpishTestPreserveWipeLvm(relbase.impish, TestPreserveWipeLvm): | 36 | class ManticTestPreserveWipeLvm(relbase.mantic, TestPreserveWipeLvm): |
976 | 37 | __test__ = True | 37 | __test__ = True |
977 | 38 | 38 | ||
978 | 39 | 39 | ||
979 | @@ -56,13 +56,13 @@ class FocalTestPreserveWipeLvmSimple(relbase.focal, TestPreserveWipeLvmSimple): | |||
980 | 56 | __test__ = True | 56 | __test__ = True |
981 | 57 | 57 | ||
982 | 58 | 58 | ||
985 | 59 | class HirsuteTestPreserveWipeLvmSimple(relbase.hirsute, | 59 | class JammyTestPreserveWipeLvmSimple(relbase.jammy, TestPreserveWipeLvmSimple): |
984 | 60 | TestPreserveWipeLvmSimple): | ||
986 | 61 | __test__ = True | 60 | __test__ = True |
987 | 62 | 61 | ||
988 | 63 | 62 | ||
991 | 64 | class ImpishTestPreserveWipeLvmSimple(relbase.impish, | 63 | class ManticTestPreserveWipeLvmSimple( |
992 | 65 | TestPreserveWipeLvmSimple): | 64 | relbase.mantic, TestPreserveWipeLvmSimple |
993 | 65 | ): | ||
994 | 66 | __test__ = True | 66 | __test__ = True |
995 | 67 | 67 | ||
996 | 68 | 68 | ||
997 | diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py | |||
998 | index 04c16b7..7e42e7e 100644 | |||
999 | --- a/tests/vmtests/test_preserve_raid.py | |||
1000 | +++ b/tests/vmtests/test_preserve_raid.py | |||
1001 | @@ -29,11 +29,11 @@ class FocalTestPreserveRAID(relbase.focal, TestPreserveRAID): | |||
1002 | 29 | __test__ = True | 29 | __test__ = True |
1003 | 30 | 30 | ||
1004 | 31 | 31 | ||
1006 | 32 | class HirsuteTestPreserveRAID(relbase.hirsute, TestPreserveRAID): | 32 | class JammyTestPreserveRAID(relbase.jammy, TestPreserveRAID): |
1007 | 33 | __test__ = True | 33 | __test__ = True |
1008 | 34 | 34 | ||
1009 | 35 | 35 | ||
1011 | 36 | class ImpishTestPreserveRAID(relbase.impish, TestPreserveRAID): | 36 | class ManticTestPreserveRAID(relbase.mantic, TestPreserveRAID): |
1012 | 37 | __test__ = True | 37 | __test__ = True |
1013 | 38 | 38 | ||
1014 | 39 | 39 | ||
1015 | @@ -65,13 +65,13 @@ class FocalTestPartitionExistingRAID( | |||
1016 | 65 | __test__ = True | 65 | __test__ = True |
1017 | 66 | 66 | ||
1018 | 67 | 67 | ||
1021 | 68 | class HirsuteTestPartitionExistingRAID( | 68 | class JammyTestPartitionExistingRAID( |
1022 | 69 | relbase.hirsute, TestPartitionExistingRAID): | 69 | relbase.jammy, TestPartitionExistingRAID): |
1023 | 70 | __test__ = True | 70 | __test__ = True |
1024 | 71 | 71 | ||
1025 | 72 | 72 | ||
1028 | 73 | class ImpishTestPartitionExistingRAID( | 73 | class ManticTestPartitionExistingRAID( |
1029 | 74 | relbase.impish, TestPartitionExistingRAID): | 74 | relbase.mantic, TestPartitionExistingRAID): |
1030 | 75 | __test__ = True | 75 | __test__ = True |
1031 | 76 | 76 | ||
1032 | 77 | 77 | ||
1033 | diff --git a/tests/vmtests/test_python_apt.py b/tests/vmtests/test_python_apt.py | |||
1034 | index 4162608..1542275 100644 | |||
1035 | --- a/tests/vmtests/test_python_apt.py | |||
1036 | +++ b/tests/vmtests/test_python_apt.py | |||
1037 | @@ -31,11 +31,11 @@ class FocalTestPythonApt(relbase.focal, TestPythonApt): | |||
1038 | 31 | __test__ = True | 31 | __test__ = True |
1039 | 32 | 32 | ||
1040 | 33 | 33 | ||
1042 | 34 | class HirsuteTestPythonApt(relbase.hirsute, TestPythonApt): | 34 | class JammyTestPythonApt(relbase.jammy, TestPythonApt): |
1043 | 35 | __test__ = True | 35 | __test__ = True |
1044 | 36 | 36 | ||
1045 | 37 | 37 | ||
1047 | 38 | class ImpishTestPythonApt(relbase.impish, TestPythonApt): | 38 | class ManticTestPythonApt(relbase.mantic, TestPythonApt): |
1048 | 39 | __test__ = True | 39 | __test__ = True |
1049 | 40 | 40 | ||
1050 | 41 | 41 | ||
1051 | diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py | |||
1052 | index e682f34..53f55cc 100644 | |||
1053 | --- a/tests/vmtests/test_raid5_bcache.py | |||
1054 | +++ b/tests/vmtests/test_raid5_bcache.py | |||
1055 | @@ -92,11 +92,11 @@ class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs): | |||
1056 | 92 | __test__ = True | 92 | __test__ = True |
1057 | 93 | 93 | ||
1058 | 94 | 94 | ||
1060 | 95 | class HirsuteTestRaid5Bcache(relbase.hirsute, TestMdadmBcacheAbs): | 95 | class JammyTestRaid5Bcache(relbase.jammy, TestMdadmBcacheAbs): |
1061 | 96 | __test__ = True | 96 | __test__ = True |
1062 | 97 | 97 | ||
1063 | 98 | 98 | ||
1065 | 99 | class ImpishTestRaid5Bcache(relbase.impish, TestMdadmBcacheAbs): | 99 | class ManticTestRaid5Bcache(relbase.mantic, TestMdadmBcacheAbs): |
1066 | 100 | __test__ = True | 100 | __test__ = True |
1067 | 101 | 101 | ||
1068 | 102 | 102 | ||
1069 | diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py | |||
1070 | index a2bd1be..7a18abe 100644 | |||
1071 | --- a/tests/vmtests/test_raid_partition_to_disk.py | |||
1072 | +++ b/tests/vmtests/test_raid_partition_to_disk.py | |||
1073 | @@ -22,11 +22,11 @@ class FocalTestRAIDPartitionToDisk(relbase.focal, TestRAIDPartitionToDisk): | |||
1074 | 22 | __test__ = True | 22 | __test__ = True |
1075 | 23 | 23 | ||
1076 | 24 | 24 | ||
1078 | 25 | class HirsuteTestRAIDPartitionToDisk(relbase.hirsute, TestRAIDPartitionToDisk): | 25 | class JammyTestRAIDPartitionToDisk(relbase.jammy, TestRAIDPartitionToDisk): |
1079 | 26 | __test__ = True | 26 | __test__ = True |
1080 | 27 | 27 | ||
1081 | 28 | 28 | ||
1083 | 29 | class ImpishTestRAIDPartitionToDisk(relbase.impish, TestRAIDPartitionToDisk): | 29 | class ManticTestRAIDPartitionToDisk(relbase.mantic, TestRAIDPartitionToDisk): |
1084 | 30 | __test__ = True | 30 | __test__ = True |
1085 | 31 | 31 | ||
1086 | 32 | 32 | ||
1087 | diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py | |||
1088 | index 81c0cb0..e22598e 100644 | |||
1089 | --- a/tests/vmtests/test_reuse_lvm_member.py | |||
1090 | +++ b/tests/vmtests/test_reuse_lvm_member.py | |||
1091 | @@ -26,12 +26,12 @@ class FocalTestReuseLVMMemberPartition(relbase.focal, | |||
1092 | 26 | __test__ = True | 26 | __test__ = True |
1093 | 27 | 27 | ||
1094 | 28 | 28 | ||
1097 | 29 | class HirsuteTestReuseLVMMemberPartition(relbase.hirsute, | 29 | class JammyTestReuseLVMMemberPartition(relbase.jammy, |
1098 | 30 | TestReuseLVMMemberPartition): | 30 | TestReuseLVMMemberPartition): |
1099 | 31 | __test__ = True | 31 | __test__ = True |
1100 | 32 | 32 | ||
1101 | 33 | 33 | ||
1103 | 34 | class ImpishTestReuseLVMMemberPartition(relbase.impish, | 34 | class ManticTestReuseLVMMemberPartition(relbase.mantic, |
1104 | 35 | TestReuseLVMMemberPartition): | 35 | TestReuseLVMMemberPartition): |
1105 | 36 | __test__ = True | 36 | __test__ = True |
1106 | 37 | 37 | ||
1107 | diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py | |||
1108 | index ed52f5b..562db39 100644 | |||
1109 | --- a/tests/vmtests/test_reuse_msdos_partitions.py | |||
1110 | +++ b/tests/vmtests/test_reuse_msdos_partitions.py | |||
1111 | @@ -23,12 +23,12 @@ class FocalTestReuseMSDOSPartitions(relbase.focal, | |||
1112 | 23 | __test__ = True | 23 | __test__ = True |
1113 | 24 | 24 | ||
1114 | 25 | 25 | ||
1117 | 26 | class HirsuteTestReuseMSDOSPartitions(relbase.hirsute, | 26 | class JammyTestReuseMSDOSPartitions(relbase.jammy, |
1118 | 27 | TestReuseMSDOSPartitions): | 27 | TestReuseMSDOSPartitions): |
1119 | 28 | __test__ = True | 28 | __test__ = True |
1120 | 29 | 29 | ||
1121 | 30 | 30 | ||
1123 | 31 | class ImpishTestReuseMSDOSPartitions(relbase.impish, | 31 | class ManticTestReuseMSDOSPartitions(relbase.mantic, |
1124 | 32 | TestReuseMSDOSPartitions): | 32 | TestReuseMSDOSPartitions): |
1125 | 33 | __test__ = True | 33 | __test__ = True |
1126 | 34 | 34 | ||
1127 | diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py | |||
1128 | index 7611140..7eb96b4 100644 | |||
1129 | --- a/tests/vmtests/test_reuse_raid_member.py | |||
1130 | +++ b/tests/vmtests/test_reuse_raid_member.py | |||
1131 | @@ -32,11 +32,11 @@ class FocalTestReuseRAIDMember(relbase.focal, TestReuseRAIDMember): | |||
1132 | 32 | __test__ = True | 32 | __test__ = True |
1133 | 33 | 33 | ||
1134 | 34 | 34 | ||
1136 | 35 | class HirsuteTestReuseRAIDMember(relbase.hirsute, TestReuseRAIDMember): | 35 | class JammyTestReuseRAIDMember(relbase.jammy, TestReuseRAIDMember): |
1137 | 36 | __test__ = True | 36 | __test__ = True |
1138 | 37 | 37 | ||
1139 | 38 | 38 | ||
1141 | 39 | class ImpishTestReuseRAIDMember(relbase.impish, TestReuseRAIDMember): | 39 | class ManticTestReuseRAIDMember(relbase.mantic, TestReuseRAIDMember): |
1142 | 40 | __test__ = True | 40 | __test__ = True |
1143 | 41 | 41 | ||
1144 | 42 | 42 | ||
1145 | @@ -50,12 +50,12 @@ class FocalTestReuseRAIDMemberPartition(relbase.focal, | |||
1146 | 50 | __test__ = True | 50 | __test__ = True |
1147 | 51 | 51 | ||
1148 | 52 | 52 | ||
1151 | 53 | class HirsuteTestReuseRAIDMemberPartition(relbase.hirsute, | 53 | class JammyTestReuseRAIDMemberPartition(relbase.jammy, |
1152 | 54 | TestReuseRAIDMemberPartition): | 54 | TestReuseRAIDMemberPartition): |
1153 | 55 | __test__ = True | 55 | __test__ = True |
1154 | 56 | 56 | ||
1155 | 57 | 57 | ||
1157 | 58 | class ImpishTestReuseRAIDMemberPartition(relbase.impish, | 58 | class ManticTestReuseRAIDMemberPartition(relbase.mantic, |
1158 | 59 | TestReuseRAIDMemberPartition): | 59 | TestReuseRAIDMemberPartition): |
1159 | 60 | __test__ = True | 60 | __test__ = True |
1160 | 61 | 61 | ||
1161 | diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py | |||
1162 | index c11749e..f2207b5 100644 | |||
1163 | --- a/tests/vmtests/test_reuse_uefi_esp.py | |||
1164 | +++ b/tests/vmtests/test_reuse_uefi_esp.py | |||
1165 | @@ -41,14 +41,14 @@ class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs): | |||
1166 | 41 | return super().test_efiboot_menu_has_one_distro_entry() | 41 | return super().test_efiboot_menu_has_one_distro_entry() |
1167 | 42 | 42 | ||
1168 | 43 | 43 | ||
1170 | 44 | class HirsuteTestUefiReuseEsp(relbase.hirsute, TestUefiReuseEspAbs): | 44 | class JammyTestUefiReuseEsp(relbase.jammy, TestUefiReuseEspAbs): |
1171 | 45 | __test__ = True | 45 | __test__ = True |
1172 | 46 | 46 | ||
1173 | 47 | def test_efiboot_menu_has_one_distro_entry(self): | 47 | def test_efiboot_menu_has_one_distro_entry(self): |
1174 | 48 | return super().test_efiboot_menu_has_one_distro_entry() | 48 | return super().test_efiboot_menu_has_one_distro_entry() |
1175 | 49 | 49 | ||
1176 | 50 | 50 | ||
1178 | 51 | class ImpishTestUefiReuseEsp(relbase.impish, TestUefiReuseEspAbs): | 51 | class ManticTestUefiReuseEsp(relbase.mantic, TestUefiReuseEspAbs): |
1179 | 52 | __test__ = True | 52 | __test__ = True |
1180 | 53 | 53 | ||
1181 | 54 | def test_efiboot_menu_has_one_distro_entry(self): | 54 | def test_efiboot_menu_has_one_distro_entry(self): |
1182 | diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py | |||
1183 | index 2b91f0b..be87f72 100644 | |||
1184 | --- a/tests/vmtests/test_simple.py | |||
1185 | +++ b/tests/vmtests/test_simple.py | |||
1186 | @@ -47,14 +47,14 @@ class FocalTestSimple(relbase.focal, TestSimple): | |||
1187 | 47 | self.output_files_exist(["netplan.yaml"]) | 47 | self.output_files_exist(["netplan.yaml"]) |
1188 | 48 | 48 | ||
1189 | 49 | 49 | ||
1191 | 50 | class HirsuteTestSimple(relbase.hirsute, TestSimple): | 50 | class JammyTestSimple(relbase.jammy, TestSimple): |
1192 | 51 | __test__ = True | 51 | __test__ = True |
1193 | 52 | 52 | ||
1194 | 53 | def test_output_files_exist(self): | 53 | def test_output_files_exist(self): |
1195 | 54 | self.output_files_exist(["netplan.yaml"]) | 54 | self.output_files_exist(["netplan.yaml"]) |
1196 | 55 | 55 | ||
1197 | 56 | 56 | ||
1199 | 57 | class ImpishTestSimple(relbase.impish, TestSimple): | 57 | class ManticTestSimple(relbase.mantic, TestSimple): |
1200 | 58 | __test__ = True | 58 | __test__ = True |
1201 | 59 | 59 | ||
1202 | 60 | def test_output_files_exist(self): | 60 | def test_output_files_exist(self): |
1203 | @@ -110,14 +110,14 @@ class FocalTestSimpleStorage(relbase.focal, TestSimpleStorage): | |||
1204 | 110 | self.output_files_exist(["netplan.yaml"]) | 110 | self.output_files_exist(["netplan.yaml"]) |
1205 | 111 | 111 | ||
1206 | 112 | 112 | ||
1208 | 113 | class HirsuteTestSimpleStorage(relbase.hirsute, TestSimpleStorage): | 113 | class JammyTestSimpleStorage(relbase.jammy, TestSimpleStorage): |
1209 | 114 | __test__ = True | 114 | __test__ = True |
1210 | 115 | 115 | ||
1211 | 116 | def test_output_files_exist(self): | 116 | def test_output_files_exist(self): |
1212 | 117 | self.output_files_exist(["netplan.yaml"]) | 117 | self.output_files_exist(["netplan.yaml"]) |
1213 | 118 | 118 | ||
1214 | 119 | 119 | ||
1216 | 120 | class ImpishTestSimpleStorage(relbase.impish, TestSimpleStorage): | 120 | class ManticTestSimpleStorage(relbase.mantic, TestSimpleStorage): |
1217 | 121 | __test__ = True | 121 | __test__ = True |
1218 | 122 | 122 | ||
1219 | 123 | def test_output_files_exist(self): | 123 | def test_output_files_exist(self): |
1220 | @@ -150,14 +150,14 @@ class FocalTestGrubNoDefaults(relbase.focal, TestGrubNoDefaults): | |||
1221 | 150 | self.output_files_exist(["netplan.yaml"]) | 150 | self.output_files_exist(["netplan.yaml"]) |
1222 | 151 | 151 | ||
1223 | 152 | 152 | ||
1225 | 153 | class HirsuteTestGrubNoDefaults(relbase.hirsute, TestGrubNoDefaults): | 153 | class JammyTestGrubNoDefaults(relbase.jammy, TestGrubNoDefaults): |
1226 | 154 | __test__ = True | 154 | __test__ = True |
1227 | 155 | 155 | ||
1228 | 156 | def test_output_files_exist(self): | 156 | def test_output_files_exist(self): |
1229 | 157 | self.output_files_exist(["netplan.yaml"]) | 157 | self.output_files_exist(["netplan.yaml"]) |
1230 | 158 | 158 | ||
1231 | 159 | 159 | ||
1233 | 160 | class ImpishTestGrubNoDefaults(relbase.impish, TestGrubNoDefaults): | 160 | class ManticTestGrubNoDefaults(relbase.mantic, TestGrubNoDefaults): |
1234 | 161 | __test__ = True | 161 | __test__ = True |
1235 | 162 | 162 | ||
1236 | 163 | def test_output_files_exist(self): | 163 | def test_output_files_exist(self): |
1237 | diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py | |||
1238 | index 1a90a7d..1eeae61 100644 | |||
1239 | --- a/tests/vmtests/test_uefi_basic.py | |||
1240 | +++ b/tests/vmtests/test_uefi_basic.py | |||
1241 | @@ -100,11 +100,11 @@ class FocalUefiTestBasic(relbase.focal, TestBasicAbs): | |||
1242 | 100 | __test__ = True | 100 | __test__ = True |
1243 | 101 | 101 | ||
1244 | 102 | 102 | ||
1246 | 103 | class HirsuteUefiTestBasic(relbase.hirsute, TestBasicAbs): | 103 | class JammyUefiTestBasic(relbase.jammy, TestBasicAbs): |
1247 | 104 | __test__ = True | 104 | __test__ = True |
1248 | 105 | 105 | ||
1249 | 106 | 106 | ||
1251 | 107 | class ImpishUefiTestBasic(relbase.impish, TestBasicAbs): | 107 | class ManticUefiTestBasic(relbase.mantic, TestBasicAbs): |
1252 | 108 | __test__ = True | 108 | __test__ = True |
1253 | 109 | 109 | ||
1254 | 110 | 110 | ||
1255 | @@ -128,12 +128,12 @@ class FocalUefiTestBasic4k(relbase.focal, TestBasicAbs): | |||
1256 | 128 | disk_block_size = 4096 | 128 | disk_block_size = 4096 |
1257 | 129 | 129 | ||
1258 | 130 | 130 | ||
1260 | 131 | class HirsuteUefiTestBasic4k(relbase.hirsute, TestBasicAbs): | 131 | class JammyUefiTestBasic4k(relbase.jammy, TestBasicAbs): |
1261 | 132 | __test__ = True | 132 | __test__ = True |
1262 | 133 | disk_block_size = 4096 | 133 | disk_block_size = 4096 |
1263 | 134 | 134 | ||
1264 | 135 | 135 | ||
1266 | 136 | class ImpishUefiTestBasic4k(relbase.impish, TestBasicAbs): | 136 | class ManticUefiTestBasic4k(relbase.mantic, TestBasicAbs): |
1267 | 137 | __test__ = True | 137 | __test__ = True |
1268 | 138 | disk_block_size = 4096 | 138 | disk_block_size = 4096 |
1269 | 139 | 139 | ||
1270 | diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py | |||
1271 | index 0e310c6..1bb8fd3 100644 | |||
1272 | --- a/tests/vmtests/test_zfsroot.py | |||
1273 | +++ b/tests/vmtests/test_zfsroot.py | |||
1274 | @@ -101,12 +101,12 @@ class FocalTestZfsRoot(relbase.focal, TestZfsRootAbs): | |||
1275 | 101 | mem = 4096 | 101 | mem = 4096 |
1276 | 102 | 102 | ||
1277 | 103 | 103 | ||
1279 | 104 | class HirsuteTestZfsRoot(relbase.hirsute, TestZfsRootAbs): | 104 | class JammyTestZfsRoot(relbase.jammy, TestZfsRootAbs): |
1280 | 105 | __test__ = True | 105 | __test__ = True |
1281 | 106 | mem = 4096 | 106 | mem = 4096 |
1282 | 107 | 107 | ||
1283 | 108 | 108 | ||
1285 | 109 | class ImpishTestZfsRoot(relbase.impish, TestZfsRootAbs): | 109 | class ManticTestZfsRoot(relbase.mantic, TestZfsRootAbs): |
1286 | 110 | __test__ = True | 110 | __test__ = True |
1287 | 111 | mem = 4096 | 111 | mem = 4096 |
1288 | 112 | 112 | ||
1289 | @@ -135,12 +135,12 @@ class FocalTestZfsRootFsType(relbase.focal, TestZfsRootFsTypeAbs): | |||
1290 | 135 | mem = 4096 | 135 | mem = 4096 |
1291 | 136 | 136 | ||
1292 | 137 | 137 | ||
1294 | 138 | class HirsuteTestZfsRootFsType(relbase.hirsute, TestZfsRootFsTypeAbs): | 138 | class JammyTestZfsRootFsType(relbase.jammy, TestZfsRootFsTypeAbs): |
1295 | 139 | __test__ = True | 139 | __test__ = True |
1296 | 140 | mem = 4096 | 140 | mem = 4096 |
1297 | 141 | 141 | ||
1298 | 142 | 142 | ||
1300 | 143 | class ImpishTestZfsRootFsType(relbase.impish, TestZfsRootFsTypeAbs): | 143 | class ManticTestZfsRootFsType(relbase.mantic, TestZfsRootFsTypeAbs): |
1301 | 144 | __test__ = True | 144 | __test__ = True |
1302 | 145 | mem = 4096 | 145 | mem = 4096 |
1303 | 146 | 146 | ||
1304 | diff --git a/tools/vmtest-system-setup b/tools/vmtest-system-setup | |||
1305 | index e53118e..5172741 100755 | |||
1306 | --- a/tools/vmtest-system-setup | |||
1307 | +++ b/tools/vmtest-system-setup | |||
1308 | @@ -21,6 +21,7 @@ DEPS=( | |||
1309 | 21 | python3-apt | 21 | python3-apt |
1310 | 22 | python3-attr | 22 | python3-attr |
1311 | 23 | python3-coverage | 23 | python3-coverage |
1312 | 24 | python3-debian | ||
1313 | 24 | python3-jsonschema | 25 | python3-jsonschema |
1314 | 25 | python3-nose | 26 | python3-nose |
1315 | 26 | python3-oauthlib | 27 | python3-oauthlib |
Thanks to Chad Smith for starting the process on https:/ /code.launchpad .net/~chad. smith/curtin/ +git/curtin/ +merge/ 443701.