TFA fix for discovery plugin #15783

amolpati30 · 2024-07-26T17:04:42Z

The failure occurred because the code was deleting the discovery rule, and then attempting to read from the deleted table using the read_all() method. To resolve this issue, I added the read_after_del() method, which reads the page message after a rule is deleted or if there are no more tables.

Dependent PR: SatelliteQE/airgun#1480

amolpati30 · 2024-07-26T17:20:58Z

trigger: test-robottelo
pytest: tests/foreman/ui/test_discoveryrule.py -k test_positive_crud_with_non_admin_user
airgun: 1480

Satellite-QE · 2024-07-26T17:40:33Z

PRT Result

Build Number: 7882
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/ui/test_discoveryrule.py -k test_positive_crud_with_non_admin_user --external-logging
Test Result : =========== 1 passed, 3 deselected, 16 warnings in 761.02s (0:12:41) ===========

ColeHiggins2

Ack, pending airgun merge

jameerpathan111 · 2024-07-29T08:33:20Z

tests/foreman/ui/test_discoveryrule.py

@@ -121,7 +121,7 @@ def test_positive_crud_with_non_admin_user(

        session.discoveryrule.delete(new_rule_name)
        dr_val = session.discoveryrule.read_all()
-        assert new_rule_name not in [rule['Name'] for rule in dr_val]
+        assert new_rule_name not in dr_val


@amolpati30 you need to fix/update the rest of the tests too. There are 4 more places in the code where this change is needed. For example,

robottelo/tests/foreman/ui/test_discoveryrule.py

Line 156 in 276ddd0

dr_val = session.discoveryrule.read_all()

amolpati30 · 2024-07-31T14:14:23Z

"trigger": "test-robottelo"
"pytest": "tests/foreman/ui/test_discoveryrule.py -k 'crud_with_non_admin_user or delete_rule_with_non_admin_user or list_host_based_on_rule_search_query or end_to_end'"
"airgun": "1480"

Satellite-QE · 2024-07-31T14:57:28Z

PRT Result

Build Number: 7928
Build Status: SUCCESS
PRT Comment: pytest /opt/app-root/src/robottelo/tests/foreman -v -m build_sanity --external-logging
Test Result : ======= 12 passed, 5526 deselected, 5633 warnings in 2122.04s (0:35:22) ========

jameerpathan111 · 2024-07-31T15:23:25Z

tests/foreman/ui/test_discoveryrule.py

@@ -154,7 +154,7 @@ def test_negative_delete_rule_with_non_admin_user(
        with pytest.raises(ValueError):  # noqa: PT011 - TODO Adarsh determine better exception
            session.discoveryrule.delete(dr.name)
        dr_val = session.discoveryrule.read_all()
-        assert dr.name in [rule['Name'] for rule in dr_val]
+        assert dr.name not in dr_val


Suggested change

assert dr.name not in dr_val

assert dr.name in dr_val

@amolpati30 You have changed the assertion here. Is this expected?

amolpati30 · 2024-08-02T17:54:14Z

trigger: test-robottelo
pytest: tests/foreman/ui/test_discoveryrule.py -k 'crud_with_non_admin_user or delete_rule_with_non_admin_user or list_host_based_on_rule_search_query or end_to_end'
airgun: 1480

amolpati30 · 2024-08-23T17:20:51Z

trigger: test-robottelo
pytest: tests/foreman/ui/test_discoveryrule.py -k 'crud_with_non_admin_user or end_to_end'
airgun: 1480

Satellite-QE · 2024-08-23T17:42:44Z

PRT Result

Build Number: 8264
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/ui/test_discoveryrule.py -k crud_with_non_admin_user or end_to_end --external-logging
Test Result : =========== 2 passed, 2 deselected, 52 warnings in 935.46s (0:15:35) ===========

shweta83

Ack

update in test

shweta83 · 2024-08-28T13:21:32Z

trigger: test-robottelo
pytest: tests/foreman/ui/test_discoveryrule.py -k 'crud_with_non_admin_user or end_to_end'
airgun: 1480

Satellite-QE · 2024-08-28T13:47:47Z

PRT Result

Build Number: 8334
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/ui/test_discoveryrule.py -k crud_with_non_admin_user or end_to_end --external-logging
Test Result : =========== 2 passed, 2 deselected, 49 warnings in 845.80s (0:14:05) ===========

fixed in discoveryrule assertion update in test (cherry picked from commit 95906c1)

TFA fix for discovery plugin (#15783) fixed in discoveryrule assertion update in test (cherry picked from commit 95906c1) Co-authored-by: amolpati30 <[email protected]>

fixed in discoveryrule assertion update in test

amolpati30 added Easy Fix :) Easiest Fix to review and quick merge request. No-CherryPick PR doesnt need CherryPick to previous branches Stream Introduced in or relating directly to Satellite Stream/Master labels Jul 26, 2024

amolpati30 requested review from a team as code owners July 26, 2024 17:04

github-actions bot assigned amolpati30 Jul 26, 2024

amolpati30 mentioned this pull request Jul 26, 2024

fixed in method for discovery rule and updated it's entities SatelliteQE/airgun#1480

Merged

Satellite-QE added the PRT-Passed Indicates that latest PRT run is passed for the PR label Jul 26, 2024

amolpati30 force-pushed the discoveryrulefix branch from e9f0a14 to f90584d Compare July 26, 2024 17:59

Satellite-QE removed the PRT-Passed Indicates that latest PRT run is passed for the PR label Jul 26, 2024

amolpati30 force-pushed the discoveryrulefix branch 2 times, most recently from 5413fe0 to 276ddd0 Compare July 26, 2024 18:08

ColeHiggins2 approved these changes Jul 26, 2024

View reviewed changes

jameerpathan111 requested changes Jul 29, 2024

View reviewed changes

amolpati30 force-pushed the discoveryrulefix branch 2 times, most recently from 7fcc48a to 590e55a Compare July 31, 2024 13:57

Satellite-QE added the PRT-Passed Indicates that latest PRT run is passed for the PR label Jul 31, 2024

jameerpathan111 requested changes Jul 31, 2024

View reviewed changes

amolpati30 closed this Aug 1, 2024

amolpati30 reopened this Aug 1, 2024

amolpati30 force-pushed the discoveryrulefix branch from 590e55a to 066b80d Compare August 2, 2024 06:17

Satellite-QE removed the PRT-Passed Indicates that latest PRT run is passed for the PR label Aug 2, 2024

amolpati30 marked this pull request as draft August 2, 2024 06:27

amolpati30 force-pushed the discoveryrulefix branch from 06b3ca8 to 8a3ddea Compare August 2, 2024 12:07

amolpati30 marked this pull request as ready for review August 2, 2024 17:51

Satellite-QE removed the PRT-Failed Indicates that latest PRT run is failed for the PR label Aug 9, 2024

jyejare added the 6.16.z Introduced in or relating directly to Satellite 6.16 label Aug 22, 2024

amolpati30 force-pushed the discoveryrulefix branch from b42fd69 to ce318fb Compare August 23, 2024 16:30

Satellite-QE removed the PRT-Passed Indicates that latest PRT run is passed for the PR label Aug 23, 2024

Satellite-QE added the PRT-Passed Indicates that latest PRT run is passed for the PR label Aug 23, 2024

This was referenced Aug 26, 2024

[6.15.z] fixed in method for discovery rule and updated it's entities SatelliteQE/airgun#1529

Merged

[6.16.z] fixed in method for discovery rule and updated it's entities SatelliteQE/airgun#1530

Merged

amolpati30 requested a review from Gauravtalreja1 August 26, 2024 13:56

shweta83 approved these changes Aug 28, 2024

View reviewed changes

fixed in discoveryrule assertion

8bffb80

update in test

amolpati30 force-pushed the discoveryrulefix branch from ce318fb to 8bffb80 Compare August 28, 2024 13:10

Satellite-QE removed the PRT-Passed Indicates that latest PRT run is passed for the PR label Aug 28, 2024

Satellite-QE added the PRT-Passed Indicates that latest PRT run is passed for the PR label Aug 28, 2024

shweta83 merged commit 95906c1 into SatelliteQE:master Aug 29, 2024
11 checks passed

github-actions bot pushed a commit that referenced this pull request Aug 29, 2024

TFA fix for discovery plugin (#15783)

6b753e8

fixed in discoveryrule assertion update in test (cherry picked from commit 95906c1)

github-actions bot pushed a commit that referenced this pull request Aug 29, 2024

TFA fix for discovery plugin (#15783)

cfee537

fixed in discoveryrule assertion update in test (cherry picked from commit 95906c1)

This was referenced Aug 29, 2024

[6.15.z] TFA fix for discovery plugin #16127

Merged

[6.16.z] TFA fix for discovery plugin #16128

Merged

jyejare pushed a commit to jyejare/robottelo that referenced this pull request Oct 19, 2024

TFA fix for discovery plugin (SatelliteQE#15783)

a027331

fixed in discoveryrule assertion update in test

Gauravtalreja1 mentioned this pull request Oct 22, 2024

Fix Discovery rule tests with teardown #16743

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TFA fix for discovery plugin #15783

TFA fix for discovery plugin #15783

amolpati30 commented Jul 26, 2024 •

edited

Loading

amolpati30 commented Jul 26, 2024

Satellite-QE commented Jul 26, 2024

ColeHiggins2 left a comment

jameerpathan111 Jul 29, 2024

amolpati30 commented Jul 31, 2024

Satellite-QE commented Jul 31, 2024

jameerpathan111 Jul 31, 2024

amolpati30 commented Aug 2, 2024

amolpati30 commented Aug 23, 2024

Satellite-QE commented Aug 23, 2024

shweta83 left a comment

shweta83 commented Aug 28, 2024

Satellite-QE commented Aug 28, 2024

TFA fix for discovery plugin #15783

TFA fix for discovery plugin #15783

Conversation

amolpati30 commented Jul 26, 2024 • edited Loading

amolpati30 commented Jul 26, 2024

Satellite-QE commented Jul 26, 2024

ColeHiggins2 left a comment

Choose a reason for hiding this comment

jameerpathan111 Jul 29, 2024

Choose a reason for hiding this comment

amolpati30 commented Jul 31, 2024

Satellite-QE commented Jul 31, 2024

jameerpathan111 Jul 31, 2024

Choose a reason for hiding this comment

amolpati30 commented Aug 2, 2024

amolpati30 commented Aug 23, 2024

Satellite-QE commented Aug 23, 2024

shweta83 left a comment

Choose a reason for hiding this comment

shweta83 commented Aug 28, 2024

Satellite-QE commented Aug 28, 2024

amolpati30 commented Jul 26, 2024 •

edited

Loading