Merge ~raharper/curtin:fix/vmtest-network-vlan-skip into curtin:master

Proposed by Ryan Harper
Status: Merged
Approved by: Dan Watkins
Approved revision: c2a81ed20a4ea51ec09cab88307d7326e9acd1cb
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~raharper/curtin:fix/vmtest-network-vlan-skip
Merge into: curtin:master
Diff against target: 42 lines (+6/-6)
2 files modified
tests/vmtests/test_network_ipv6_vlan.py (+2/-2)
tests/vmtests/test_network_vlan.py (+4/-4)
Reviewer Review Type Date Requested Status
Dan Watkins (community) Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+378546@code.launchpad.net

Commit message

vmtests: bump fixby date out and fix false positive when date passes

The fix for vlan is still pending, however we've observed a false
positive where vmtest would indicate that the test was passing when
it actually was not. This is because skip_by_date will run the
decorated function *after* the fixby date has passed. The
implementation was 'pass' which does pass but did not actually run
the test case.

Fix this by calling to the super class.

LP: #1855148

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dan Watkins (oddbloke) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
2index 709886f..6d38621 100644
3--- a/tests/vmtests/test_network_ipv6_vlan.py
4+++ b/tests/vmtests/test_network_ipv6_vlan.py
5@@ -25,9 +25,9 @@ class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
6 class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):
7 __test__ = True
8
9- @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2020-01-10")
10+ @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2020-03-10")
11 def test_ip_output(self):
12- pass
13+ return super().test_ip_output()
14
15
16 class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
17diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
18index b7c4e06..cdd06c3 100644
19--- a/tests/vmtests/test_network_vlan.py
20+++ b/tests/vmtests/test_network_vlan.py
21@@ -79,17 +79,17 @@ class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
22 class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
23 __test__ = True
24
25- @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-01-10")
26+ @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
27 def test_ip_output(self):
28- pass
29+ return super().test_ip_output()
30
31
32 class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
33 __test__ = True
34
35- @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-01-10")
36+ @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
37 def test_ip_output(self):
38- pass
39+ return super().test_ip_output()
40
41
42 class Centos66TestNetworkVlan(centos_relbase.centos66_xenial,

Subscribers

People subscribed via source and target branches