Skip to content

CherryPicked: [cnv-4.20] Remove redundant and duplicated by upstream t2 tests #5962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cnv-tests-github-webhook-dollierp wants to merge 1 commit into
base: cnv-4.20
Choose a base branch
from
Open

CherryPicked: [cnv-4.20] Remove redundant and duplicated by upstream t2 tests #5962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions tests/install_upgrade_operators/launcher_updates/test_default_launcher_updates.py
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions tests/install_upgrade_operators/product_uninstall/test_remove_kubevirt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ def remove_kubevirt_vm(unprivileged_client, namespace):
yield vm


@pytest.mark.polarion("CNV-3738")
@pytest.mark.s390x
def test_validate_default_uninstall_strategy(kubevirt_resource):
strategy = kubevirt_resource.instance.spec.uninstallStrategy
assert strategy == "BlockUninstallIfWorkloadsExist", (
f"Default uninstall strategy is incorrect.Expected 'BlockUninstallIfWorkloadsExist', found '{strategy}'"
)


@pytest.mark.polarion("CNV-3718")
@pytest.mark.destructive
def test_block_removal(kubevirt_resource, remove_kubevirt_vm):
Expand Down
6 changes: 0 additions & 6 deletions tests/install_upgrade_operators/relationship_labels/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@
MANAGED_BY_LABEL_KEY = f"{Resource.ApiGroup.APP_KUBERNETES_IO}/managed-by"
COMPONENT_LABEL_KEY = f"{Resource.ApiGroup.APP_KUBERNETES_IO}/component"
PART_OF_LABEL_KEY = f"{Resource.ApiGroup.APP_KUBERNETES_IO}/part-of"
ALL_LABEL_KEYS = [
MANAGED_BY_LABEL_KEY,
VERSION_LABEL_KEY,
COMPONENT_LABEL_KEY,
PART_OF_LABEL_KEY,
]
# Daemonset expected labels
EXPECTED_VIRT_DAEMONSETS_LABELS_DICT_MAP = {
BRIDGE_MARKER: {
Expand Down
150 changes: 0 additions & 150 deletions tests/install_upgrade_operators/relationship_labels/test_all_cnv_resources.py
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions tests/install_upgrade_operators/strict_reconciliation/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,21 +130,6 @@ def hco_with_non_default_feature_gates(
yield


@pytest.fixture()
def cr_func_map(
hco_spec,
kubevirt_hyperconverged_spec_scope_function,
cdi_spec,
network_addons_config_scope_session,
):
yield {
"hco": hco_spec,
"kubevirt": kubevirt_hyperconverged_spec_scope_function,
"cdi": cdi_spec,
"cnao": network_addons_config_scope_session.instance.to_dict(),
}


@pytest.fixture()
def hco_status_related_objects_scope_function(hyperconverged_resource_scope_function):
"""
Expand Down
Loading