Revert test to as it was

redballoonsecurity · Jan 8, 2025 · d1fad05 · d1fad05
1 parent a7bf4e7
commit d1fad05
Showing 1 changed file with 29 additions and 5 deletions.
diff --git a/ofrak_core/test_ofrak/service/resource_service/test_resource_service.py b/ofrak_core/test_ofrak/service/resource_service/test_resource_service.py
@@ -8,6 +8,7 @@
 from ofrak.core.code_region import CodeRegion
 from ofrak.core.complex_block import ComplexBlock
 from ofrak.core.data import DataWord
+from ofrak.core.filesystem import File
 from ofrak.core.instruction import Instruction
 from ofrak.core.memory_region import MemoryRegion
 from ofrak.model.resource_model import (
@@ -209,7 +210,10 @@ async def test_get_depths(
             [R_ID_3_ROOT],
             r_filter=ResourceFilter(
                 include_self=True,
-                tags=(GenericBinary,),
+                tags=(
+                    File,
+                    GenericBinary,
+                ),
                 tags_condition=ResourceFilterCondition.AND,
                 attribute_filters=None,
             ),
@@ -363,7 +367,10 @@ async def test_get_ancestors_by_id(
             [R_ID_3_ROOT],
             r_filter=ResourceFilter(
                 include_self=True,
-                tags=(GenericBinary,),
+                tags=(
+                    File,
+                    GenericBinary,
+                ),
                 tags_condition=ResourceFilterCondition.AND,
                 attribute_filters=None,
             ),
@@ -374,11 +381,23 @@ async def test_get_ancestors_by_id(
             [R_ID_3_ROOT],
             r_filter=ResourceFilter(
                 include_self=True,
-                tags=(GenericBinary,),
+                tags=(
+                    File,
+                    GenericBinary,
+                ),
                 tags_condition=ResourceFilterCondition.AND,
                 attribute_filters=None,
             ),
-            extra_resources=[((GenericBinary,), ())] * 10,
+            extra_resources=[
+                (
+                    (
+                        File,
+                        GenericBinary,
+                    ),
+                    (),
+                )
+            ]
+            * 10,
         ),
         GetDescendantsTestCase(
             "attributes filter: exact value (attributes filter cheapest)",
@@ -902,7 +921,12 @@ async def test_get_root_resources(self, triple_populated_resource_service):
             R_ID_1_ROOT: ResourceModel(R_ID_1_ROOT),
             R_ID_2_ROOT: ResourceModel(R_ID_2_ROOT),
             R_ID_3_ROOT: ResourceModel.create(
-                R_ID_3_ROOT, tags=(GenericBinary,), attributes=(TestIndexAttributes(5),)
+                R_ID_3_ROOT,
+                tags=(
+                    File,
+                    GenericBinary,
+                ),
+                attributes=(TestIndexAttributes(5),),
             ),
         }