Skip to content
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

[6.13.z] Fixing Discovery tests #12926

Merged
merged 2 commits into from
Nov 6, 2023
Merged

[6.13.z] Fixing Discovery tests #12926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65ba353
Fixing Discovery tests (#12914)
adarshdubey-star Oct 17, 2023
319920c
Merge branch '6.13.z' into cherry-pick-6.13.z-bb8eb50bc8ed34b1933db62…
adarshdubey-star Nov 6, 2023
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
12 changes: 6 additions & 6 deletions tests/foreman/api/test_discoveredhost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class TestDiscoveredHost:
@pytest.mark.on_premises_provisioning
@pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
@pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
@pytest.mark.rhel_ver_match('[^6]')
@pytest.mark.rhel_ver_list([8, 9])
@pytest.mark.tier3
def test_positive_provision_pxe_host(
self,
Expand Down Expand Up @@ -204,8 +204,8 @@ def test_positive_provision_pxe_host(
mac = provisioning_host._broker_args['provisioning_nic_mac_addr']
wait_for(
lambda: sat.api.DiscoveredHost().search(query={'mac': mac}) != [],
timeout=240,
delay=20,
timeout=600,
delay=40,
)
discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
discovered_host.hostgroup = provisioning_hostgroup
Expand All @@ -227,7 +227,7 @@ def test_positive_provision_pxe_host(
@pytest.mark.on_premises_provisioning
@pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
@pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
@pytest.mark.rhel_ver_match('[^6]')
@pytest.mark.rhel_ver_list([8, 9])
@pytest.mark.tier3
def test_positive_provision_pxe_less_host(
self,
Expand All @@ -254,8 +254,8 @@ def test_positive_provision_pxe_less_host(
mac = pxeless_discovery_host._broker_args['provisioning_nic_mac_addr']
wait_for(
lambda: sat.api.DiscoveredHost().search(query={'mac': mac}) != [],
timeout=240,
delay=20,
timeout=600,
delay=40,
)
discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
discovered_host.hostgroup = provisioning_hostgroup
Expand Down
12 changes: 6 additions & 6 deletions tests/foreman/cli/test_discoveredhost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@pytest.mark.on_premises_provisioning
@pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
@pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
@pytest.mark.rhel_ver_match('8')
@pytest.mark.rhel_ver_match('7')
def test_rhel_pxe_discovery_provisioning(
module_provisioning_rhel_content,
module_discovery_sat,
Expand Down Expand Up @@ -57,8 +57,8 @@ def test_rhel_pxe_discovery_provisioning(

wait_for(
lambda: sat.api.DiscoveredHost().search(query={'mac': mac}) != [],
timeout=240,
delay=20,
timeout=600,
delay=40,
)
discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
discovered_host.hostgroup = provisioning_hostgroup
Expand Down Expand Up @@ -95,7 +95,7 @@ def _finalize():
@pytest.mark.on_premises_provisioning
@pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
@pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
@pytest.mark.rhel_ver_match('8')
@pytest.mark.rhel_ver_match('7')
def test_rhel_pxeless_discovery_provisioning(
module_discovery_sat,
pxeless_discovery_host,
Expand All @@ -120,8 +120,8 @@ def test_rhel_pxeless_discovery_provisioning(

wait_for(
lambda: sat.api.DiscoveredHost().search(query={'mac': mac}) != [],
timeout=240,
delay=20,
timeout=600,
delay=40,
)
discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
discovered_host.hostgroup = provisioning_hostgroup
Expand Down