fix

Author: swalrus1

ydb/tests/olap/lib/ydb_cluster.py

@@ -8,7 +8,7 @@
 from ydb.tests.olap.lib.utils import get_external_param
 from copy import deepcopy
 from time import sleep, time
-from typing import List, Optional
+from typing import List, Optional, Callable
 from enum import Enum
 
 LOGGER = logging.getLogger()
@@ -172,15 +172,14 @@ def get_ydb_driver(cls):
         return cls._ydb_driver
 
     @classmethod
-    def list_directory_tree(cls, root_path: str, rel_path: str, kind_order_key = None) -> List[ydb.SchemeEntry]:
-        """
-        kind_order_key: Optional[SchemeEntryType -> int]
-        """
+    def list_directory_tree(cls, root_path: str, rel_path: str, kind_order_key: Optional[Callable[[ydb.SchemeEntryType], int]] = None) -> List[ydb.SchemeEntry]:
         path = f'{root_path}/{rel_path}' if root_path else rel_path
         LOGGER.info(f'list {path}')
         result = []
         entries = cls.get_ydb_driver().scheme_client.list_directory(path).children
-        for child in sorted(entries, key=lambda x: kind_order_key(x.type)):
+        if kind_order_key:
+            entries = sorted(entries, key=lambda x: kind_order_key(x.type))
+        for child in entries:
             if child.name == '.sys':
                 continue
             child.name = f'{rel_path}/{child.name}'

ydb/tests/olap/scenario/helpers/scenario_tests_helper.py

@@ -684,6 +684,7 @@ def list_path_tree(self, path: str, folder: str) -> List[ydb.SchemeEntry]:
             ydb.SchemeEntryType.COLUMN_STORE,
             ydb.SchemeEntryType.EXTERNAL_DATA_SOURCE,
         ]
+
         def kind_order_key_reversed(kind):
             try:
                 return -kind_order.index(kind)