Skip to content

Commit

Permalink
mend
Browse files Browse the repository at this point in the history
  • Loading branch information
adarshdubey-star committed Dec 15, 2023
1 parent cd2ec33 commit 4efa059
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions pytest_fixtures/core/xdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ def align_to_satellite(request, worker_id, satellite_factory):
worker_pos = int(worker_id.replace('gw', ''))

# attempt to add potential satellites from the broker inventory file
if settings.server.inventory_filter:
hosts = Satellite.get_hosts_from_inventory(filter=settings.server.inventory_filter)
settings.server.hostnames += [host.hostname for host in hosts]
# if settings.server.inventory_filter:
# hosts = Satellite.get_hosts_from_inventory(filter=settings.server.inventory_filter)
# settings.server.hostnames += [host.hostname for host in hosts]

# attempt to align a worker to a satellite
if settings.server.xdist_behavior == 'run-on-one' and settings.server.hostnames:
Expand Down
10 changes: 5 additions & 5 deletions tests/foreman/ui/test_registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

def test_positive_verify_default_values_for_global_registration(
session,
target_sat,
module_target_sat,
default_org,
default_location,
default_os,
Expand All @@ -31,14 +31,14 @@ def test_positive_verify_default_values_for_global_registration(
:id: 34122bf3-ae23-47ca-ba3d-da0653d8fd33
:expectedresults: Some of the fields in the form should be populated
e.g. organizatoin, location,remote-execution, insights setup.
e.g. organization, location,remote-execution, insights setup.
:CaseLevel: Integration
:CaseLevel: Component
:steps:
1.Check for the default values in the global registration template
"""
ak = target_sat.cli_factory.make_activation_key(
ak = module_target_sat.cli_factory.make_activation_key(
{'organization-id': default_org.id, 'name': gen_string('alpha')}
)
with session:
Expand All @@ -58,4 +58,4 @@ def test_positive_verify_default_values_for_global_registration(
assert cmd['general']['capsule'] == 'Nothing to select.'
assert cmd['advanced']['update_packages'] is False
assert cmd['advanced']['ignore_error'] is False
assert cmd['advanced']['force'] is False
assert cmd['advanced']['force'] is False

0 comments on commit 4efa059

Please sign in to comment.