Skip to content

Commit

Permalink
Remove nailgun entity_mixin import from discovery test
Browse files Browse the repository at this point in the history
Signed-off-by: Gaurav Talreja <gtalreja@redhat.com>
  • Loading branch information
Gauravtalreja1 committed May 23, 2024
1 parent 77d0790 commit b0d42d0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
13 changes: 12 additions & 1 deletion robottelo/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,26 @@ def get_url():
return urlunsplit((scheme, hostname, '', '', ''))


def user_nailgun_config(username=None, password=None):
def default_nailgun_config():
"""Return a NailGun configuration file constructed from default values.
:param user: The ```nailgun.entities.User``` object of an user with additional passwd
property/attribute
:return: ``nailgun.config.ServerConfig`` object, populated from user parameter object else
with values from ``robottelo.config.settings``
"""
return ServerConfig(get_url(), get_credentials(), verify=settings.server.verify_ca)


def user_nailgun_config(username=None, password=None):
"""Return a NailGun configuration file constructed from default values.
:param user: The ```nailgun.entities.User``` object of an user with additional passwd
property/attribute
:return: ``nailgun.config.ServerConfig`` object, populated from user parameter object else
with values from ``robottelo.config.settings``
"""
creds = (username, password)
return ServerConfig(get_url(), creds, verify=settings.server.verify_ca)
Expand Down
4 changes: 2 additions & 2 deletions tests/foreman/destructive/test_discoveredhost.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
from copy import copy
import re

from nailgun import entity_mixins
import pytest
from wait_for import TimedOutError, wait_for

from robottelo.config import default_nailgun_config
from robottelo.logging import logger

pytestmark = pytest.mark.destructive
Expand Down Expand Up @@ -124,7 +124,7 @@ def _assert_discovered_host(host, channel=None, user_config=None, sat=None):
# raise assertion error
raise AssertionError('Timed out waiting for "/facts" 201 response') from err

default_config = entity_mixins.DEFAULT_SERVER_CONFIG
default_config = default_nailgun_config()

try:
wait_for(
Expand Down

0 comments on commit b0d42d0

Please sign in to comment.