Skip to content

Commit 8ddf1d7

Browse files
matejmatuskamatejmatuska
committed
linter fix
1 parent efebf19 commit 8ddf1d7

File tree

2 files changed

+46
-40
lines changed

2 files changed

+46
-40
lines changed

‎repos/system_upgrade/common/actors/peseventsscanner/libraries/pes_events_scanner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,10 @@ def apply_transaction_configuration(source_pkgs):
483483
def remove_leapp_related_events(events):
484484
leapp_pkgs = [
485485
'leapp', 'leapp-deps', 'leapp-upgrade-el7toel8', 'leapp-upgrade-el8toel9',
486-
'leapp-upgrade-el7toel8-deps', 'leapp-upgrade-el8toel9-deps','python2-leapp',
486+
'leapp-upgrade-el7toel8-deps', 'leapp-upgrade-el8toel9-deps', 'python2-leapp',
487487
'python3-leapp', 'snactor', 'cockpit-leapp'
488488
]
489-
return [e for e in events if all(pkg.name not in leapp_pkgs for pkg in e.in_pkgs)]
489+
return [e for e in events if any(pkg.name not in leapp_pkgs for pkg in e.in_pkgs)]
490490

491491

492492
def process():

‎repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -406,57 +406,63 @@ def test_pkgs_are_demodularized_when_crossing_major_version(monkeypatch):
406406

407407
def test_remove_leapp_related_events():
408408
# these are just hypothetical and not necessarily correct
409+
package_set_two_leapp = {Package('leapp-upgrade-el7toel8', 'repoid-rhel8', None),
410+
Package('leapp-upgrade-el7toel8-deps', 'repoid-rhel7', None)}
411+
package_set_one_leapp = {Package('leapp-upgrade-el7toel8', 'repoid-rhel8', None),
412+
Package('leapp-upgrade-el7toel8-deps', 'repoid-rhel7', None)}
409413
in_events = [
410-
Event(1, Action.PRESENT, {Package('leapp', 'repoid-rhel7', None)}, {Package('leapp', 'repoid-rhel8', None)},
414+
Event(1, Action.PRESENT, {Package('leapp', 'repoid-rhel7', None)},
415+
{Package('leapp', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
416+
417+
Event(1, Action.RENAMED, {Package('leapp-deps', 'repoid-rhel7', None)},
418+
{Package('leapp-deps', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
419+
Event(1, Action.RENAMED, {Package('leapp-upgrade-el7toel8', 'repoid-rhel7', None)},
420+
{Package('leapp-upgrade-el8toel9', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
421+
Event(2, Action.RENAMED, {Package('leapp-upgrade-el7toel8-deps', 'repoid-rhel7', None)},
422+
{Package('leapp-upgrade-el8toel9-deps', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
423+
Event(2, Action.PRESENT, {Package('cockpit-leapp', 'repoid-rhel7', None)},
424+
{Package('cockpit-leapp', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
425+
Event(2, Action.PRESENT, {Package('snactor', 'repoid-rhel7', None)},
426+
{Package('snactor', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
427+
Event(2, Action.REPLACED, {Package('python2-leapp', 'repoid-rhel7', None)},
428+
{Package('python3-leapp', 'repoid-rhel8', None)},
411429
(7, 0), (8, 0), []),
412430

413-
Event(1, Action.RENAMED, {Package('leapp-deps', 'repoid-rhel7', None)}, {Package('leapp-deps', 'repoid-rhel8', None)},
414-
(7, 0), (8, 0), []),
415-
Event(1, Action.RENAMED, {Package('leapp-upgrade-el7toel8', 'repoid-rhel7', None)}, {Package('leapp-upgrade-el8toel9', 'repoid-rhel8', None)},
416-
(7, 0), (8, 0), []),
417-
Event(2, Action.RENAMED, {Package('leapp-upgrade-el7toel8-deps', 'repoid-rhel7', None)}, {Package('leapp-upgrade-el8toel9-deps', 'repoid-rhel8', None)},
418-
(7, 0), (8, 0), []),
419-
Event(2, Action.PRESENT, {Package('cockpit-leapp', 'repoid-rhel7', None)}, {Package('cockpit-leapp', 'repoid-rhel8', None)},
420-
(7, 0), (8, 0), []),
421-
Event(2, Action.PRESENT, {Package('snactor', 'repoid-rhel7', None)}, {Package('snactor', 'repoid-rhel8', None)},
422-
(7, 0), (8, 0), []),
423-
Event(2, Action.REPLACED, {Package('python2-leapp', 'repoid-rhel7', None)}, {Package('python3-leapp', 'repoid-rhel8', None)},
424-
(7, 0), (8, 0), []),
425-
426-
Event(1, Action.DEPRECATED, {Package('leapp-upgrade-el8toel9', 'repoid-rhel8', None)}, {Package('leapp-upgrade-el8toel9', 'repoid-rhel9', None)},
427-
(8, 0), (9, 0), []),
428-
Event(2, Action.REMOVED, {Package('leapp-upgrade-el8toel9-deps', 'repoid-rhel8', None)}, {}, (8, 0), (9, 0), []),
429-
Event(2, Action.PRESENT, {Package('cockpit-leapp', 'repoid-rhel8', None)}, {Package('cockpit-leapp', 'repoid-rhel9', None)},
430-
(7, 0), (8, 0), []),
431-
Event(1, Action.RENAMED, {Package('leapp-deps', 'repoid-rhel8', None)}, {Package('leapp-deps', 'repoid-rhel9', None)},
432-
(8, 0), (9, 0), []),
433-
Event(2, Action.PRESENT, {Package('snactor', 'repoid-rhel8', None)}, {Package('snactor', 'repoid-rhel9', None)},
434-
(8, 0), (9, 0), []),
435-
Event(2, Action.REMOVED, {Package('python3-leapp', 'repoid-rhel8', None)}, {Package('snactor', 'repoid-rhel9', None)},
436-
(8, 0), (9, 0), []),
437-
438-
Event(2, Action.PRESENT, {Package('other-pkg', 'repoid-rhel8', None)}, {Package('other-pkg', 'repoid-rhel9', None)},
439-
(7, 0), (8, 0), []),
440-
Event(2, Action.PRESENT, {Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel7', None)}, {Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel8', None)},
441-
(7, 0), (8, 0), []),
431+
Event(1, Action.DEPRECATED, {Package('leapp-upgrade-el8toel9', 'repoid-rhel8', None)},
432+
{Package('leapp-upgrade-el8toel9', 'repoid-rhel9', None)}, (8, 0), (9, 0), []),
433+
Event(2, Action.REMOVED, {Package('leapp-upgrade-el8toel9-deps', 'repoid-rhel8', None)},
434+
{}, (8, 0), (9, 0), []),
435+
Event(2, Action.PRESENT, {Package('cockpit-leapp', 'repoid-rhel8', None)},
436+
{Package('cockpit-leapp', 'repoid-rhel9', None)}, (7, 0), (8, 0), []),
437+
Event(1, Action.RENAMED, {Package('leapp-deps', 'repoid-rhel8', None)},
438+
{Package('leapp-deps', 'repoid-rhel9', None)}, (8, 0), (9, 0), []),
439+
Event(2, Action.PRESENT, {Package('snactor', 'repoid-rhel8', None)},
440+
{Package('snactor', 'repoid-rhel9', None)}, (8, 0), (9, 0), []),
441+
Event(2, Action.REMOVED, {Package('python3-leapp', 'repoid-rhel8', None)},
442+
{Package('snactor', 'repoid-rhel9', None)}, (8, 0), (9, 0), []),
443+
444+
Event(2, Action.PRESENT, {Package('other-pkg', 'repoid-rhel8', None)},
445+
{Package('other-pkg', 'repoid-rhel9', None)}, (7, 0), (8, 0), []),
446+
Event(2, Action.PRESENT, {Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel7', None)},
447+
{Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
442448

443449
# multiple leapp packages in in_pkgs
444-
Event(1, Action.MERGED, {Package('leapp-upgrade-el7toel8', 'repoid-rhel7', None), Package('leapp-upgrade-el7toel8-deps', 'repoid-rhel7', None)},
445-
{Package('leapp-upgrade-el7toel8', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
450+
Event(1, Action.MERGED, package_set_two_leapp, {Package('leapp-upgrade-el7toel8', 'repoid-rhel8', None)},
451+
(7, 0), (8, 0), []),
446452

447453
# multiple leapp packages in out_pkgs
448454
Event(1, Action.SPLIT, {Package('leapp-upgrade-el7toel8', 'repoid-rhel7', None)},
449-
{Package('leapp-upgrade-el7toel8', 'repoid-rhel8', None), Package('leapp-upgrade-el7toel8-deps', 'repoid-rhel7', None)}, (7, 0), (8, 0), []),
455+
package_set_two_leapp, (7, 0), (8, 0), []),
450456

451457
# leapp and other pkg in in_pkgs
452-
Event(1, Action.MERGED, {Package('leapp', 'repoid-rhel7', None), Package('other-pkg', 'repoid-rhel7', None)}, {Package('leapp', 'repoid-rhel8', None), },
458+
Event(1, Action.MERGED, package_set_one_leapp, {Package('leapp', 'repoid-rhel8', None)},
453459
(7, 0), (8, 0), []),
454460
]
455461
expected_out_events = [
456-
Event(2, Action.PRESENT, {Package('other-pkg', 'repoid-rhel8', None)}, {Package('other-pkg', 'repoid-rhel9', None)},
457-
(7, 0), (8, 0), []),
458-
Event(2, Action.PRESENT, {Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel7', None)}, {Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel8', None)},
459-
(7, 0), (8, 0), []),
462+
Event(2, Action.PRESENT, {Package('other-pkg', 'repoid-rhel8', None)},
463+
{Package('other-pkg', 'repoid-rhel9', None)}, (7, 0), (8, 0), []),
464+
Event(2, Action.PRESENT, {Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel7', None)},
465+
{Package('other-pkg-with-leapp-in-the-name', 'repoid-rhel8', None)}, (7, 0), (8, 0), []),
460466
]
461467

462468
out_events = pes_events_scanner.remove_leapp_related_events(in_events)

0 commit comments

Comments
 (0)