Fixes to EventProgress and kubernetes test:

- Update EventProgress.watch to complete imediately when event is set
instead of needing every to elapse
- Fix test_adjust_tuning_never_ready not reraising non-matching
RuntimeError

servo/types/core.py

@@ -19,6 +19,7 @@
 
 import abc
 import asyncio
+import contextlib
 import datetime
 import enum
 import inspect
@@ -587,7 +588,25 @@ async def watch(
             else:
                 every = min(Duration("60s"), self.timeout)
 
-        return await super().watch(notify, every)
+        # return await super().watch(notify, every)
+        async def async_notifier() -> None:
+            if asyncio.iscoroutinefunction(notify):
+                await notify(self)
+            else:
+                notify(self)
+
+        if not self.started:
+            self.start()
+
+        while True:
+            if self.finished:
+                break
+
+            with contextlib.suppress(asyncio.TimeoutError):
+                await asyncio.wait_for(
+                    self._event.wait(), timeout=every.total_seconds()
+                )
+            await async_notifier()
 
 
 class Unit(str, enum.Enum):

tests/connectors/kubernetes_test.py

@@ -1969,6 +1969,8 @@ async def test_adjust_tuning_never_ready(
                 in str(e)
             ):
                 pytest.xfail("Tuning pod shutdown took over 30 seconds")
+            else:
+                raise
 
         # Validate the correct error was raised, re-raise if not for additional debugging context
         try: