|
18 | 18 | import pytest |
19 | 19 |
|
20 | 20 | from robottelo.config import settings |
| 21 | +from robottelo.hosts import get_sat_version |
21 | 22 | from robottelo.utils.datafactory import filtered_datapoint, gen_string |
22 | 23 |
|
23 | 24 |
|
@@ -228,7 +229,9 @@ def test_positive_update_login_page_footer_text(session, setting_update): |
228 | 229 | session.login.login(login_details) |
229 | 230 | session.settings.update(f'name = {property_name}', default_value) |
230 | 231 | result = session.login.logout() |
231 | | - assert result["login_text"] == default_value |
| 232 | + sat_version = get_sat_version() |
| 233 | + default_value_with_version_expanded = default_value.replace('$VERSION', str(sat_version)) |
| 234 | + assert result["login_text"] == default_value_with_version_expanded |
232 | 235 |
|
233 | 236 | # set empty |
234 | 237 | session.login.login(login_details) |
@@ -531,21 +534,28 @@ def test_positive_setting_display_fqdn_for_hosts(session, target_sat): |
531 | 534 | """ |
532 | 535 | host_name, domain_name = target_sat.hostname.split('.', 1) |
533 | 536 | default_value = target_sat.update_setting('display_fqdn_for_hosts', 'No') |
534 | | - with target_sat.ui_session() as session: |
535 | | - dashboard_hosts = session.dashboard.read('NewHosts') |
536 | | - assert host_name in [h['Host'] for h in dashboard_hosts['hosts'] if h['Host'] == host_name] |
537 | | - |
538 | | - values = session.host_new.get_details(host_name, widget_names='breadcrumb') |
539 | | - assert values['breadcrumb'] == host_name |
540 | | - |
541 | | - # Verify with display_fqdn_for_hosts=Yes |
| 537 | + try: |
| 538 | + with target_sat.ui_session() as session: |
| 539 | + dashboard_hosts = session.dashboard.read('NewHosts') |
| 540 | + assert host_name in [ |
| 541 | + h['Host'] for h in dashboard_hosts['hosts'] if h['Host'] == host_name |
| 542 | + ] |
| 543 | + |
| 544 | + values = session.host_new.get_details(host_name, widget_names='breadcrumb') |
| 545 | + assert values['breadcrumb'] == host_name |
| 546 | + |
| 547 | + # Verify with display_fqdn_for_hosts=Yes |
| 548 | + target_sat.update_setting('display_fqdn_for_hosts', 'Yes') |
| 549 | + full_name = '.'.join((host_name, domain_name)) |
| 550 | + dashboard_hosts = session.dashboard.read('NewHosts') |
| 551 | + assert full_name in [ |
| 552 | + h['Host'] for h in dashboard_hosts['hosts'] if h['Host'] == full_name |
| 553 | + ] |
| 554 | + |
| 555 | + values = session.host_new.get_details(target_sat.hostname, widget_names='breadcrumb') |
| 556 | + assert values['breadcrumb'] == full_name |
| 557 | + finally: |
542 | 558 | target_sat.update_setting('display_fqdn_for_hosts', default_value) |
543 | | - full_name = '.'.join((host_name, domain_name)) |
544 | | - dashboard_hosts = session.dashboard.read('NewHosts') |
545 | | - assert full_name in [h['Host'] for h in dashboard_hosts['hosts'] if h['Host'] == full_name] |
546 | | - |
547 | | - values = session.host_new.get_details(target_sat.hostname, widget_names='breadcrumb') |
548 | | - assert values['breadcrumb'] == full_name |
549 | 559 |
|
550 | 560 |
|
551 | 561 | def test_positive_show_unsupported_templates(request, target_sat, module_org, module_location): |
|
0 commit comments