Use ByteString field for RootDirectory

A root_scanner unit test for non-utf8 filename has been added as well. OAMG-4306 Depends-On: oamg/leapp#789
fernflower · Jul 29, 2022 · cc2a502 · cc2a502
1 parent 7b570ed
commit cc2a502
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/repos/system_upgrade/common/actors/checkrootsymlinks/tests/unit_test_checkrootsymlinks.py b/repos/system_upgrade/common/actors/checkrootsymlinks/tests/unit_test_checkrootsymlinks.py
@@ -9,7 +9,8 @@
     ({'bin': '/usr/bin'}, True),
     ({'sbin': 'usr/bin'}, False),
     ({'sbin': '/usr/sbin'}, True),
-    ({'lib': '/usr/lib', 'lib64': 'usr/lib64'}, True)])
+    ({'lib': '/usr/lib', 'lib64': 'usr/lib64'}, True),
+    ({b'\xc4\xc9\xd2\xc5\xcb\xd4\xcf\xd2\xc9\xd1': ''}, False)])
 def test_wrong_symlink_inhibitor(current_actor_context, modified, expected_report):
     subdirs = {
         'bin': 'usr/bin',

diff --git a/repos/system_upgrade/common/models/rootdirectory.py b/repos/system_upgrade/common/models/rootdirectory.py
@@ -1,4 +1,4 @@
-from leapp.models import Model, fields
+from leapp.models import fields, Model
 from leapp.topics import SystemFactsTopic
 
 
@@ -7,7 +7,7 @@ class RootSubdirectory(Model):
     Representation of a single root subdirectory. Can be expanded as needed.
     """
     topic = SystemFactsTopic
-    name = fields.String()
+    name = fields.ByteString()
     target = fields.Nullable(fields.String())  # if it's a link