diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py b/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py index 19b760a184..826ae06d62 100644 --- a/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py +++ b/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py @@ -1001,7 +1001,7 @@ def test_consume_data(monkeypatch, raised, no_rhsm, testdata): # do not write never into testdata inside the test !! xfs = testdata.xfs custom_repofiles = testdata.custom_repofiles - _exp_pkgs = {'dnf', 'dnf-command(config-manager)'} + _exp_pkgs = {'dnf', 'dnf-command(config-manager)', 'util-linux'} _exp_files = [] def _get_pkgs(msg): diff --git a/repos/system_upgrade/common/actors/test_actor/actor.py b/repos/system_upgrade/common/actors/test_actor/actor.py new file mode 100644 index 0000000000..a9f2e08976 --- /dev/null +++ b/repos/system_upgrade/common/actors/test_actor/actor.py @@ -0,0 +1,19 @@ +import os # noqa: F401 + +from leapp.actors import Actor +from leapp.tags import ChecksPhaseTag +from leapp.libraries.stdlib import run + + +class TestActor(Actor): + """ + No documentation has been provided for the test_actor actor. + """ + + name = 'test_actor' + consumes = () + produces = () + tags = (ChecksPhaseTag,) + + def process(self): + run(['echo', '-e', '\\x80'], encoding='utf-8') diff --git a/repos/system_upgrade/common/actors/test_actor/files/test.sh b/repos/system_upgrade/common/actors/test_actor/files/test.sh new file mode 100755 index 0000000000..599cff8ffa --- /dev/null +++ b/repos/system_upgrade/common/actors/test_actor/files/test.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo -e '\x80' diff --git a/repos/system_upgrade/common/actors/test_actor/files/test.txt b/repos/system_upgrade/common/actors/test_actor/files/test.txt new file mode 100644 index 0000000000..c995b1e3cc --- /dev/null +++ b/repos/system_upgrade/common/actors/test_actor/files/test.txt @@ -0,0 +1 @@ +€ diff --git a/repos/system_upgrade/common/libraries/rpms.py b/repos/system_upgrade/common/libraries/rpms.py index d2ffe14bb5..58b92b47fb 100644 --- a/repos/system_upgrade/common/libraries/rpms.py +++ b/repos/system_upgrade/common/libraries/rpms.py @@ -35,7 +35,7 @@ class LeappComponents(object): }, LeappComponents.COCKPIT: {'7': {'pkgs': ['cockpit-leapp']}, '8': {'pkgs': ['cockpit-leapp']}, - '9': {'pkgs': ['']} + '9': {'pkgs': []} }, LeappComponents.TOOLS: {'7': {'pkgs': ['snactor']}, '8': {'pkgs': ['snactor']}, diff --git a/repos/system_upgrade/common/libraries/tests/test_rpms.py b/repos/system_upgrade/common/libraries/tests/test_rpms.py index 955ab05cd6..a527407d0b 100644 --- a/repos/system_upgrade/common/libraries/tests/test_rpms.py +++ b/repos/system_upgrade/common/libraries/tests/test_rpms.py @@ -61,7 +61,7 @@ def test_get_leapp_packages(major_version, component, result, monkeypatch): r"component nosuchcomponent is unknown, available choices are \['cockpit', 'framework', 'repository', 'tools']") ), ('nosuchversion', "framework", - (ValueError, r"major_version nosuchversion is unknown, available choices are \['7', '8']")), + (ValueError, r"major_version nosuchversion is unknown, available choices are \['7', '8', '9']")), ('nosuchversion', False, (ValueError, r"At least one component must be specified when calling this function," r" available choices are \['cockpit', 'framework', 'repository', 'tools']")),