[feat/1316] test cases fix

Author: divyabiyani

jupyter_server/prometheus/server.py

@@ -234,7 +234,11 @@ def stop(self) -> None:
             self.http_server.stop()
             self.http_server = None
 
+<<<<<<< HEAD
         if hasattr(self, "ioloop") and self.ioloop:
+=======
+        if hasattr(self, 'ioloop') and self.ioloop is not None:
+>>>>>>> 96530763b ([feat/1316] test cases fix)
             # Stop the IOLoop
             self.ioloop.add_callback(self.ioloop.stop)
             self.ioloop = None

jupyter_server/serverapp.py

@@ -3146,7 +3146,6 @@ def start_app(self) -> None:
             # Determine metrics URL based on whether separate metrics server is running
             if (
                 self.metrics_port
-                and self.metrics_server is not None
                 and hasattr(self.metrics_server, "port")
                 and self.metrics_server.port is not None
             ):
@@ -3243,7 +3242,7 @@ async def _cleanup(self) -> None:
             self.http_server.stop()
         if hasattr(self, "metrics_server"):
             # Stop the metrics server if it's running
-            if self.metrics_server is not None and hasattr(self.metrics_server, "stop"):
+            if hasattr(self.metrics_server, 'stop'):
                 self.metrics_server.stop()
 
     def start_ioloop(self) -> None:

jupyter_server/services/contents/handlers.py

@@ -25,12 +25,9 @@
 
 
 def _validate_keys(expect_defined: bool, model: dict[str, Any], keys: list[str]):
-    """
-    Validate that the keys are defined (i.e. not None) or not (i.e. None)
-    """
-
+    """Validate that keys are defined or not defined as expected."""
     if expect_defined:
-        errors = [key for key in keys if model[key] is None]
+        errors = {key: model[key] for key in keys if model[key] is None}
         if errors:
             raise web.HTTPError(
                 500,
@@ -400,7 +397,7 @@ class NotebooksRedirectHandler(JupyterHandler):
         "PATCH",
         "POST",
         "DELETE",
-    )  # type:ignore[assignment]
+    )
 
     @allow_unauthenticated
     def get(self, path):