Skip to content

Commit b3bcebc

Browse files
authored
Merge branch 'cnv-4.19' into rename_disk_transfer_rate_bytes_metric419
2 parents 4cb5a8f + 0f43107 commit b3bcebc

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

tests/network/OWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ reviewers:
66
- Anatw
77
- EdDev
88
- servolkov
9+
- azhivovk

tests/network/connectivity/test_ovs_linux_bridge.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ def test_ipv4_linux_bridge(
5050
@pytest.mark.post_upgrade
5151
@pytest.mark.polarion("CNV-11125")
5252
@pytest.mark.ipv6
53-
@pytest.mark.single_nic
5453
def test_ipv6_linux_bridge(
5554
self,
5655
fail_if_not_ipv6_supported_cluster,

tests/network/localnet/conftest.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,9 @@ def localnet_vms_have_connectivity(localnet_running_vms: tuple[BaseVirtualMachin
272272

273273

274274
@pytest.fixture()
275-
@pytest.mark.usefixtures("localnet_vms_have_connectivity")
276-
def migrated_localnet_vm(localnet_running_vms: tuple[BaseVirtualMachine, BaseVirtualMachine]) -> BaseVirtualMachine:
275+
def migrated_localnet_vm(
276+
localnet_vms_have_connectivity: None, localnet_running_vms: tuple[BaseVirtualMachine, BaseVirtualMachine]
277+
) -> BaseVirtualMachine:
277278
vm, _ = localnet_running_vms
278279
migrate_vm_and_verify(vm=vm)
279280
return vm

0 commit comments

Comments
 (0)