Hoping this messy merge went smoothly...

... but not really betting on it.
distributed-system-analysis · Dec 9, 2022 · a2cbb37 · a2cbb37
1 parent 2011f0c
commit a2cbb37
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/lib/pbench/server/api/resources/datasets_metadata.py b/lib/pbench/server/api/resources/datasets_metadata.py
@@ -13,7 +13,6 @@
     ApiBase,
     ApiContext,
     ApiMethod,
-    APIInternalError,
     ApiParams,
     ApiSchema,
     Parameter,

diff --git a/lib/pbench/server/api/resources/query_apis/__init__.py b/lib/pbench/server/api/resources/query_apis/__init__.py
@@ -2,6 +2,7 @@
 from dataclasses import dataclass
 from datetime import datetime
 from http import HTTPStatus
+import json
 from logging import Logger
 import re
 from typing import Any, Callable, Iterator, List, Optional
@@ -21,8 +22,8 @@
     ApiAuthorizationType,
     ApiBase,
     ApiContext,
-    ApiMethod,
     APIInternalError,
+    ApiMethod,
     ApiParams,
     ApiSchema,
     ParamType,

diff --git a/lib/pbench/server/api/resources/query_apis/datasets/__init__.py b/lib/pbench/server/api/resources/query_apis/datasets/__init__.py
@@ -3,9 +3,9 @@
 
 from pbench.server import JSON, PbenchServerConfig
 from pbench.server.api.resources import (
-    APIInternalError,
     ApiAuthorizationType,
     ApiContext,
+    APIInternalError,
     ApiParams,
     ApiSchema,
     ParamType,

diff --git a/lib/pbench/server/api/resources/query_apis/datasets/datasets_mappings.py b/lib/pbench/server/api/resources/query_apis/datasets/datasets_mappings.py
@@ -8,8 +8,8 @@
     ApiAuthorizationType,
     ApiBase,
     ApiContext,
-    ApiMethod,
     APIInternalError,
+    ApiMethod,
     ApiParams,
     ApiSchema,
     Parameter,

diff --git a/lib/pbench/server/api/resources/query_apis/datasets/namespace_and_rows.py b/lib/pbench/server/api/resources/query_apis/datasets/namespace_and_rows.py
@@ -3,8 +3,8 @@
 
 from pbench.server import JSON, OperationCode, PbenchServerConfig
 from pbench.server.api.resources import (
-    APIInternalError,
     ApiAuthorizationType,
+    APIInternalError,
     ApiMethod,
     ApiParams,
     ApiSchema,

diff --git a/lib/pbench/server/api/resources/server_configuration.py b/lib/pbench/server/api/resources/server_configuration.py
@@ -10,8 +10,8 @@
     ApiAuthorizationType,
     ApiBase,
     ApiContext,
-    ApiMethod,
     APIInternalError,
+    ApiMethod,
     ApiParams,
     ApiSchema,
     Parameter,

diff --git a/lib/pbench/test/unit/server/test_datasets_metadata.py b/lib/pbench/test/unit/server/test_datasets_metadata.py
@@ -3,8 +3,8 @@
 import pytest
 import requests
 
-from pbench.server import JSON
-from pbench.server.database.models.audit import Audit
+from pbench.server import JSON, OperationCode
+from pbench.server.database.models.audit import Audit, AuditStatus, AuditType
 from pbench.server.database.models.datasets import Dataset, DatasetNotFound
 
 

diff --git a/lib/pbench/test/unit/server/test_server_configuration.py b/lib/pbench/test/unit/server/test_server_configuration.py
@@ -92,7 +92,7 @@ def test_put_bad_uri_key(self, server_config):
         routing.
         """
         put = ServerConfiguration(server_config, logging.getLogger("test"))
-        with pytest.raises(APIAbort, match=r"Found URI parameters \['foo', 'plugh'\]"):
+        with pytest.raises(APIAbort, match="Missing parameter 'key'"):
             put._put_key(ApiParams(uri={"plugh": "xyzzy", "foo": "bar"}), context=None)
 
     def test_put_missing_value(self, query_put):