Minor cleanup

distributed-system-analysis · Apr 10, 2023 · da63dd0 · da63dd0
1 parent 4c18379
commit da63dd0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/lib/pbench/server/api/resources/datasets_list.py b/lib/pbench/server/api/resources/datasets_list.py
@@ -412,7 +412,7 @@ def datasets(
                 else:
                     raise APIAbort(
                         HTTPStatus.BAD_REQUEST,
-                        f"The sort order in {sort!r} must be 'asc' or 'desc'",
+                        f"The sort order {o!r} for key {k!r} must be 'asc' or 'desc'",
                     )
 
             if not Metadata.is_key_path(k, Metadata.METADATA_KEYS, metalog_key_ok=True):

diff --git a/lib/pbench/test/unit/server/test_datasets_list.py b/lib/pbench/test/unit/server/test_datasets_list.py
@@ -915,12 +915,12 @@ def test_dataset_sort(self, server_config, query_as, sort, results):
             (
                 # Specify a sort using an undefined order keyword
                 "dataset.name:backwards",
-                "The sort order in 'dataset.name:backwards' must be 'asc' or 'desc'",
+                "The sort order 'backwards' for key 'dataset.name' must be 'asc' or 'desc'",
             ),
             (
                 # Specify a sort using bad sort order syntax
                 "dataset.name:desc:",
-                "The sort order in 'dataset.name:desc:' must be 'asc' or 'desc'",
+                "The sort order 'desc:' for key 'dataset.name' must be 'asc' or 'desc'",
             ),
             (
                 # Specify a sort using a bad metadata namespace
@@ -938,14 +938,6 @@ def test_dataset_sort_errors(self, server_config, query_as, sort, message):
             sort: A JSON representation of the sort query parameter value
             message: The expected error message
         """
-
-        # Assign "sequence numbers" in the inverse order of name
-        test = User.query(username="test")
-        all = Database.db_session.query(Dataset).order_by(desc(Dataset.name)).all()
-        for i, d in enumerate(all):
-            odd = i & 1
-            Metadata.setvalue(d, "global.test.sequence", i)
-            Metadata.setvalue(d, "user.test.odd", odd, user=test)
         query = {"sort": sort}
         result = query_as(query, "test", HTTPStatus.BAD_REQUEST)
         assert result.json["message"] == message