Merge ~raharper/curtin:fix/vmtest-update-skipbugs into curtin:master

Proposed by Ryan Harper
Status: Merged
Approved by: Paride Legovini
Approved revision: 428480d0364f38e38684ccf4067f0205c56928f9
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~raharper/curtin:fix/vmtest-update-skipbugs
Merge into: curtin:master
Diff against target: 121 lines (+4/-13)
7 files modified
tests/vmtests/test_basic.py (+0/-1)
tests/vmtests/test_mdadm_bcache.py (+1/-1)
tests/vmtests/test_network_ipv6_vlan.py (+0/-4)
tests/vmtests/test_network_vlan.py (+0/-2)
tests/vmtests/test_nvme.py (+1/-1)
tests/vmtests/test_raid5_bcache.py (+1/-1)
tests/vmtests/test_reuse_uefi_esp.py (+1/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Paride Legovini Approve
Review via email: mp+384749@code.launchpad.net

Commit message

vmtests: update skiptests

- Drop skiptests for vlan issue, now fixed
- Drop skiptest on Ubuntu ReuseESP tests
- Add skiptest for Centos, new Bug #1881030
- Drop skip-by-date for CentosTestScsiBasic
  Bug #1859858 is fixed
- Bump skip_by_date on tests with bcache by-uuid symlinks,
  Bug #1861951 not fixed yet.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paride Legovini (paride) wrote :

Thanks Ryan!

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

Commit message lints:
- Line #6 has 1 too many characters. Line starts with: "- Bump skip_by_date on"...

review: Needs Fixing
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
2index e50318d..88b9897 100644
3--- a/tests/vmtests/test_basic.py
4+++ b/tests/vmtests/test_basic.py
5@@ -340,7 +340,6 @@ class Centos70BionicTestScsiBasic(centos_relbase.centos70_bionic,
6 __test__ = True
7
8
9-@VMBaseClass.skip_by_date("1859858", fixby="2020-03-06", install=False)
10 class Centos70FocalTestScsiBasic(centos_relbase.centos70_focal,
11 TestBasicScsiAbs, CentosTestBasicAbs):
12 __test__ = True
13diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
14index 53637ae..8e250cc 100644
15--- a/tests/vmtests/test_mdadm_bcache.py
16+++ b/tests/vmtests/test_mdadm_bcache.py
17@@ -160,7 +160,7 @@ class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
18 class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
19 __test__ = True
20
21- @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
22+ @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
23 def test_fstab(self):
24 return super().test_fstab()
25
26diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
27index 6d38621..d8e4e16 100644
28--- a/tests/vmtests/test_network_ipv6_vlan.py
29+++ b/tests/vmtests/test_network_ipv6_vlan.py
30@@ -25,10 +25,6 @@ class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
31 class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):
32 __test__ = True
33
34- @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2020-03-10")
35- def test_ip_output(self):
36- return super().test_ip_output()
37-
38
39 class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
40 __test__ = True
41diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
42index cdd06c3..4a8d776 100644
43--- a/tests/vmtests/test_network_vlan.py
44+++ b/tests/vmtests/test_network_vlan.py
45@@ -79,7 +79,6 @@ class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
46 class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
47 __test__ = True
48
49- @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
50 def test_ip_output(self):
51 return super().test_ip_output()
52
53@@ -87,7 +86,6 @@ class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
54 class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
55 __test__ = True
56
57- @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
58 def test_ip_output(self):
59 return super().test_ip_output()
60
61diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
62index ca36ca8..c1576fa 100644
63--- a/tests/vmtests/test_nvme.py
64+++ b/tests/vmtests/test_nvme.py
65@@ -143,7 +143,7 @@ class EoanTestNvmeBcache(relbase.eoan, TestNvmeBcacheAbs):
66 __test__ = True
67
68
69-@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
70+@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
71 class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
72 __test__ = True
73
74diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
75index 7138a2c..0f0b87b 100644
76--- a/tests/vmtests/test_raid5_bcache.py
77+++ b/tests/vmtests/test_raid5_bcache.py
78@@ -95,7 +95,7 @@ class EoanTestRaid5Bcache(relbase.eoan, TestMdadmBcacheAbs):
79 class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):
80 __test__ = True
81
82- @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
83+ @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
84 def test_fstab(self):
85 return super().test_fstab()
86
87diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
88index 1e99935..31c5e7d 100644
89--- a/tests/vmtests/test_reuse_uefi_esp.py
90+++ b/tests/vmtests/test_reuse_uefi_esp.py
91@@ -16,6 +16,7 @@ class TestUefiReuseEspAbs(TestBasicAbs):
92 self.assertEqual(1, len(distro_lines))
93
94
95+@TestUefiReuseEspAbs.skip_by_date("1881030", fixby="2020-07-15")
96 class Cent70TestUefiReuseEsp(cent_rbase.centos70_bionic, TestUefiReuseEspAbs):
97 __test__ = True
98
99@@ -28,7 +29,6 @@ class XenialGATestUefiReuseEsp(relbase.xenial_ga, TestUefiReuseEspAbs):
100 class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
101 __test__ = True
102
103- @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
104 def test_efiboot_menu_has_one_distro_entry(self):
105 return super().test_efiboot_menu_has_one_distro_entry()
106
107@@ -36,7 +36,6 @@ class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
108 class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
109 __test__ = True
110
111- @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
112 def test_efiboot_menu_has_one_distro_entry(self):
113 return super().test_efiboot_menu_has_one_distro_entry()
114
115@@ -44,7 +43,6 @@ class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
116 class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs):
117 __test__ = True
118
119- @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
120 def test_efiboot_menu_has_one_distro_entry(self):
121 return super().test_efiboot_menu_has_one_distro_entry()
122

Subscribers

People subscribed via source and target branches