Edward Haas has uploaded a new change for review.
Change subject: net tests: Remove redundant label from func test template.
......................................................................
net tests: Remove redundant label from func test template.
The new functional test format are using a template test class with two
sublasses, one for each switch type (legacy, ovs).
With NOSE 1.3.0 there was a need to overcome a bug, that did not pass
correctly the NOSE test labels, by labeling the template class in
addition to the subclasses.
As we are now requiring NOSE 1.3.7 for the test run, the template class
tests have been cleaned.
Change-Id: I2f75bb1d6aabceceff65d673ec776cd5b5c939c3
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M tests/network/func_bond_basic_test.py
M tests/network/func_dhclient_test.py
M tests/network/func_dns_test.py
M tests/network/func_net_basic_test.py
M tests/network/func_rollback_test.py
M tests/network/func_static_ip_test.py
6 files changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/63931/1
diff --git a/tests/network/func_bond_basic_test.py
b/tests/network/func_bond_basic_test.py
index 1f0cc6b..b6b7dd6 100644
--- a/tests/network/func_bond_basic_test.py
+++ b/tests/network/func_bond_basic_test.py
@@ -28,7 +28,6 @@
BOND_NAME = 'bond1'
-@attr(type='functional')
class BondBasicTemplate(NetFuncTestCase):
__test__ = False
diff --git a/tests/network/func_dhclient_test.py b/tests/network/func_dhclient_test.py
index 532eaf5..99c9315 100644
--- a/tests/network/func_dhclient_test.py
+++ b/tests/network/func_dhclient_test.py
@@ -37,7 +37,6 @@
DHCPv4_RANGE_TO = '192.0.3.253'
-@attr(type='functional')
class NetworkDhcpBasicTemplate(NetFuncTestCase):
__test__ = False
@@ -75,7 +74,6 @@
switch = 'ovs'
-@attr(type='functional')
class StopDhclientOnUsedNicsTemplate(NetFuncTestCase):
__test__ = False
diff --git a/tests/network/func_dns_test.py b/tests/network/func_dns_test.py
index aa4be68..0aa245c 100644
--- a/tests/network/func_dns_test.py
+++ b/tests/network/func_dns_test.py
@@ -34,7 +34,6 @@
IPv4_NETMASK = '255.255.255.0'
-@attr(type='functional')
class NetworkDNSTemplate(NetFuncTestCase):
__test__ = False
diff --git a/tests/network/func_net_basic_test.py b/tests/network/func_net_basic_test.py
index f937202..af14424 100644
--- a/tests/network/func_net_basic_test.py
+++ b/tests/network/func_net_basic_test.py
@@ -29,7 +29,6 @@
VLAN = 10
-@attr(type='functional')
class NetworkBasicTemplate(NetFuncTestCase):
__test__ = False
diff --git a/tests/network/func_rollback_test.py b/tests/network/func_rollback_test.py
index 1db9aff..19b5d22 100644
--- a/tests/network/func_rollback_test.py
+++ b/tests/network/func_rollback_test.py
@@ -33,7 +33,6 @@
IPv4_NETMASK = '255.255.255.0'
-@attr(type='functional')
class NetworkRollbackTemplate(NetFuncTestCase):
__test__ = False
diff --git a/tests/network/func_static_ip_test.py b/tests/network/func_static_ip_test.py
index 529e01e..6f336f0 100644
--- a/tests/network/func_static_ip_test.py
+++ b/tests/network/func_static_ip_test.py
@@ -42,7 +42,6 @@
IPv4IPv6 = [4, 6]
-@attr(type='functional')
class NetworkStaticIpBasicTemplate(NetFuncTestCase):
__test__ = False
@@ -135,7 +134,6 @@
switch = 'ovs'
-@attr(type='functional')
class AcquireNicsWithStaticIPTemplate(NetFuncTestCase):
__test__ = False
--
To view, visit
https://gerrit.ovirt.org/63931
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f75bb1d6aabceceff65d673ec776cd5b5c939c3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>