[feat/1316] test cases fix

Author: divyabiyani

jupyter_server/kernelspecs/handlers.py

@@ -16,7 +16,7 @@
 class KernelSpecResourceHandler(web.StaticFileHandler, JupyterHandler):
     """A Kernelspec resource handler."""
 
-    SUPPORTED_METHODS = ("GET", "HEAD")  # type:ignore[assignment]
+    SUPPORTED_METHODS = ("GET", "HEAD")
     auth_resource = AUTH_RESOURCE
 
     def initialize(self):

jupyter_server/nbconvert/handlers.py

@@ -90,7 +90,7 @@ class NbconvertFileHandler(JupyterHandler):
     """An nbconvert file handler."""
 
     auth_resource = AUTH_RESOURCE
-    SUPPORTED_METHODS = ("GET",)  # type:ignore[assignment]
+    SUPPORTED_METHODS = ("GET",)
 
     @web.authenticated
     @authorized
@@ -158,7 +158,7 @@ async def get(self, format, path):
 class NbconvertPostHandler(JupyterHandler):
     """An nbconvert post handler."""
 
-    SUPPORTED_METHODS = ("POST",)  # type:ignore[assignment]
+    SUPPORTED_METHODS = ("POST",)
     auth_resource = AUTH_RESOURCE
 
     @web.authenticated

jupyter_server/prometheus/server.py

@@ -206,20 +206,20 @@ def start(self, port: int) -> None:
 
         # Start the IOLoop in a separate thread
         def start_metrics_loop():
-            loop = tornado.ioloop.IOLoop()
-            loop.make_current()
+            self.ioloop = tornado.ioloop.IOLoop()
+            self.ioloop.make_current()
 
             # Set up periodic updates in this IOLoop
             def periodic_update_wrapper():
                 if hasattr(self, "_periodic_update"):
                     self._periodic_update()
                 # Schedule next update in 30 seconds
-                loop.call_later(30, periodic_update_wrapper)
+                self.ioloop.call_later(30, periodic_update_wrapper)
 
             # Start periodic updates
-            loop.call_later(30, periodic_update_wrapper)
+            self.ioloop.call_later(30, periodic_update_wrapper)
 
-            loop.start()
+            self.ioloop.start()
 
         self.thread = threading.Thread(target=start_metrics_loop, daemon=True)
         self.thread.start()
@@ -234,12 +234,16 @@ def stop(self) -> None:
             self.http_server.stop()
             self.http_server = None
 
+        if hasattr(self, 'ioloop') and self.ioloop:
+            # Stop the IOLoop
+            self.ioloop.add_callback(self.ioloop.stop)
+            self.ioloop = None
+
         if self.thread and self.thread.is_alive():
-            # Note: Tornado IOLoop doesn't have a clean stop method
-            # The thread will exit when the process ends
-            pass
+            # Wait for thread to finish (with timeout)
+            self.thread.join(timeout=1.0)
 
-        self.server_app.log.info(f"Metrics server stopped on port {self.port}")
+        self.server_app.log.info(f"Metrics server stopped on port {getattr(self, 'port', 'unknown')}")
 
 
 def start_metrics_server(server_app, port: int) -> PrometheusMetricsServer:

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 hasattr(self, "metrics_server")
                 and self.metrics_server is not None
                 and hasattr(self.metrics_server, "port")
                 and self.metrics_server.port is not None
@@ -3244,7 +3243,8 @@ async def _cleanup(self) -> None:
             self.http_server.stop()
         if hasattr(self, "metrics_server"):
             # Stop the metrics server if it's running
-            self.metrics_server.stop()
+            if self.metrics_server is not None and hasattr(self.metrics_server, 'stop'):
+                self.metrics_server.stop()
 
     def start_ioloop(self) -> None:
         """Start the IO Loop."""

jupyter_server/services/contents/handlers.py

@@ -37,7 +37,7 @@ def _validate_keys(expect_defined: bool, model: dict[str, Any], keys: list[str])
                 f"Keys unexpectedly None: {errors}",
             )
     else:
-        errors = {key: model[key] for key in keys if model[key] is not None}  # type: ignore[assignment]
+        errors = {key: model[key] for key in keys if model[key] is not None}
         if errors:
             raise web.HTTPError(
                 500,