opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15099 from davelopez/fix_flaky_api_test

Browse Source 
Sort library folders by name by default
This commit is contained in:
David López
2022-12-01 22:13:01 +01:00
committed by GitHub
parent 0aa0feb610 4566b59c01
commit fbf076c0ce
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/managers/folders.py
+2
View File
@@ -405,6 +405,8 @@ class FolderManager:
if payload.order_by in FOLDER_SORT_COLUMN_MAP:
sort_column = FOLDER_SORT_COLUMN_MAP[payload.order_by](model.LibraryFolder)
sub_folders_query = sub_folders_query.order_by(sort_column.desc() if payload.sort_desc else sort_column)
else: # Sort by name alphabetically by default
sub_folders_query = sub_folders_query.order_by(model.LibraryFolder.name)
if limit is not None:
sub_folders_query = sub_folders_query.limit(limit)
if offset is not None:
lib/galaxy_test/api/test_folder_contents.py
+2 -2
View File
@@ -259,7 +259,7 @@ class TestFolderContentsApi(ApiTestCase):
dataset_names = ["a", "b", "c"]
ldda_messages = ["Message Z", "Message Y", "Message X"]
dataset_sizes = [50, 100, 10]
file_types = ["txt", "csv", "txt"]
file_types = ["txt", "csv", "json"]
for index, name in enumerate(dataset_names):
self._create_dataset_in_folder(
history_id,
@@ -285,7 +285,7 @@ class TestFolderContentsApi(ApiTestCase):
self._assert_folder_order_by_is_expected(folder_id, order_by, sort_desc, expected_order_by_name)
order_by = "type"
expected_order_by_name = ["Folder_A", "Folder_B", "Folder_C", "b", "a", "c"]
expected_order_by_name = ["Folder_A", "Folder_B", "Folder_C", "b", "c", "a"]
self._assert_folder_order_by_is_expected(folder_id, order_by, sort_desc, expected_order_by_name)
order_by = "size"