Fixing CI errors

rich/spinner.py

@@ -46,11 +46,7 @@ class Spinner:
     def __rich_console__(
         self, console: "Console", options: "ConsoleOptions"
     ) -> "RenderResult":
-        time = console.get_time()
+        yield self.render(console.get_time())
-        if self.start_time is None:
-            self.start_time = time
-        text = self.render(time - self.start_time)
-        yield text
 
     def __rich_measure__(
         self, console: "Console", options: "ConsoleOptions"
@@ -67,13 +63,21 @@ class Spinner:
         Returns:
             RenderableType: A renderable containing animation frame.
         """
-        frame_no = (time * self.speed) / (self.interval / 1000.0) + self.frame_no_offset
+        if self.start_time is None:
+            self.start_time = time
+
+        frame_no = ((time - self.start_time) * self.speed) / (
+            self.interval / 1000.0
+        ) + self.frame_no_offset
+        frame = Text(
+            self.frames[int(frame_no) % len(self.frames)], style=self.style or ""
+        )
+
         if self._update_speed:
             self.frame_no_offset = frame_no
-            self.start_time += time
+            self.start_time = time
             self.speed = self._update_speed
             self._update_speed = 0.0
-        frame = Text(self.frames[int(frame_no) % len(self.frames)], style=self.style or "")
 
         if not self.text:
             return frame

tests/test_progress.py

@@ -93,7 +93,7 @@ def test_spinner_column():
     task = Task(1, "test", 100, 20, _get_time=lambda: 1.0)
     result = column.render(task)
     print(repr(result))
-    expected = "⡿"
+    expected = "⣾"
     assert str(result) == expected