Test fixes

Author: willmcgugan

pyproject.toml

@@ -63,6 +63,7 @@ enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 module = ["pygments.*", "IPython.*", "ipywidgets.*"]
 ignore_missing_imports = true
 
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 

rich/panel.py

@@ -203,6 +203,8 @@ def align_text(
 
         title_text = self._title
         if title_text is not None:
+            if title_text.style is not None:
+                title_text.stylize_before(title_text.style)
             title_text.stylize_before(partial_border_style)
 
         child_width = (

tests/test_console.py

@@ -31,6 +31,8 @@
 from rich.style import Style
 from rich.text import Text
 
+os.get_terminal_size
+
 
 def test_dumb_terminal():
     console = Console(force_terminal=True, _environ={})
@@ -140,7 +142,7 @@ def test_size():
     "is_windows,no_descriptor_size,stdin_size,stdout_size,stderr_size,expected_size",
     [
         # on Windows we'll use `os.get_terminal_size()` without arguments...
-        (True, (133, 24), ValueError, ValueError, ValueError, (133, 24)),
+        (True, (133, 24), ValueError, ValueError, ValueError, (80, 25)),
         (False, (133, 24), ValueError, ValueError, ValueError, (80, 25)),
         # ...while on other OS we'll try to pass stdin, then stdout, then stderr to it:
         (False, ValueError, (133, 24), ValueError, ValueError, (133, 24)),
@@ -157,8 +159,8 @@ def test_size_can_fall_back_to_std_descriptors(
     stdin_size: Union[Tuple[int, int], Type[ValueError]],
     stdout_size: Union[Tuple[int, int], Type[ValueError]],
     stderr_size: Union[Tuple[int, int], Type[ValueError]],
-    expected_size,
-):
+    expected_size: Tuple[int, int],
+) -> None:
     def get_terminal_size_mock_impl(fileno: int = None) -> Tuple[int, int]:
         value = {
             None: no_descriptor_size,

tests/test_progress.py

@@ -14,6 +14,7 @@
     BarColumn,
     DownloadColumn,
     FileSizeColumn,
+    IterationSpeedColumn,
     MofNCompleteColumn,
     Progress,
     RenderableColumn,
@@ -26,7 +27,6 @@
     TimeRemainingColumn,
     TotalFileSizeColumn,
     TransferSpeedColumn,
-    IterationSpeedColumn,
     _TrackThread,
     track,
 )
@@ -379,7 +379,7 @@ def test_columns() -> None:
 
     result = replace_link_ids(console.file.getvalue())
     print(repr(result))
-    expected = "\x1b[?25ltest foo \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/10\x1b[0m \x1b[32m 0 of 10\x1b[0m \n                                                    \x1b[32mbytes    \x1b[0m                  \ntest bar \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:19\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m7 bytes \x1b[0m \x1b[32m0/7 bytes\x1b[0m \x1b[31m?\x1b[0m \x1b[32m0/7  \x1b[0m \x1b[32m0 of 7  \x1b[0m \r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[2;36m[TIME]\x1b[0m\x1b[2;36m \x1b[0mhello                                                                    \ntest foo \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/10\x1b[0m \x1b[32m 0 of 10\x1b[0m \n                                                    \x1b[32mbytes    \x1b[0m                  \ntest bar \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:19\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m7 bytes \x1b[0m \x1b[32m0/7 bytes\x1b[0m \x1b[31m?\x1b[0m \x1b[32m0/7  \x1b[0m \x1b[32m0 of 7  \x1b[0m \r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2Kworld\ntest foo \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/10\x1b[0m \x1b[32m 0 of 10\x1b[0m \n                                                    \x1b[32mbytes    \x1b[0m                  \ntest bar \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:19\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m7 bytes \x1b[0m \x1b[32m0/7 bytes\x1b[0m \x1b[31m?\x1b[0m \x1b[32m0/7  \x1b[0m \x1b[32m0 of 7  \x1b[0m \r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2Ktest foo \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m12    \x1b[0m \x1b[32m10    \x1b[0m \x1b[32m12/10  \x1b[0m \x1b[31m1     \x1b[0m \x1b[32m12/10\x1b[0m \x1b[32m12 of  \x1b[0m \x1b[31m1.3    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbyte/s\x1b[0m       \x1b[32m10     \x1b[0m \x1b[31mit/s   \x1b[0m\ntest bar \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m16    \x1b[0m \x1b[32m7     \x1b[0m \x1b[32m16/7   \x1b[0m \x1b[31m2     \x1b[0m \x1b[32m16/7 \x1b[0m \x1b[32m16 of 7\x1b[0m \x1b[31m1.5    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbytes…\x1b[0m               \x1b[31mit/s   \x1b[0m\r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2Ktest foo \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m12    \x1b[0m \x1b[32m10    \x1b[0m \x1b[32m12/10  \x1b[0m \x1b[31m1     \x1b[0m \x1b[32m12/10\x1b[0m \x1b[32m12 of  \x1b[0m \x1b[31m1.3    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbyte/s\x1b[0m       \x1b[32m10     \x1b[0m \x1b[31mit/s   \x1b[0m\ntest bar \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m16    \x1b[0m \x1b[32m7     \x1b[0m \x1b[32m16/7   \x1b[0m \x1b[31m2     \x1b[0m \x1b[32m16/7 \x1b[0m \x1b[32m16 of 7\x1b[0m \x1b[31m1.5    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbytes…\x1b[0m               \x1b[31mit/s   \x1b[0m\n\x1b[?25h\r\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K"
+    expected = "\x1b[?25ltest foo \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/10\x1b[0m \x1b[32m 0 of 10\x1b[0m \n                                                    \x1b[32mbytes    \x1b[0m                  \ntest bar \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:19\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m7 bytes \x1b[0m \x1b[32m0/7 bytes\x1b[0m \x1b[31m?\x1b[0m \x1b[32m0/7  \x1b[0m \x1b[32m0 of 7  \x1b[0m \r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2Kfoo\ntest foo \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/10\x1b[0m \x1b[32m 0 of 10\x1b[0m \n                                                    \x1b[32mbytes    \x1b[0m                  \ntest bar \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:19\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m7 bytes \x1b[0m \x1b[32m0/7 bytes\x1b[0m \x1b[31m?\x1b[0m \x1b[32m0/7  \x1b[0m \x1b[32m0 of 7  \x1b[0m \r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[2;36m[TIME]\x1b[0m\x1b[2;36m \x1b[0mhello                                                                    \ntest foo \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/10\x1b[0m \x1b[32m 0 of 10\x1b[0m \n                                                    \x1b[32mbytes    \x1b[0m                  \ntest bar \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:19\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m7 bytes \x1b[0m \x1b[32m0/7 bytes\x1b[0m \x1b[31m?\x1b[0m \x1b[32m0/7  \x1b[0m \x1b[32m0 of 7  \x1b[0m \r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2Kworld\ntest foo \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:07\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m10 bytes\x1b[0m \x1b[32m0/10     \x1b[0m \x1b[31m?\x1b[0m \x1b[32m 0/10\x1b[0m \x1b[32m 0 of 10\x1b[0m \n                                                    \x1b[32mbytes    \x1b[0m                  \ntest bar \x1b[38;5;237m━━━━━━━━━\x1b[0m \x1b[36m-:--:--\x1b[0m \x1b[33m0:00:19\x1b[0m \x1b[32m0 bytes\x1b[0m \x1b[32m7 bytes \x1b[0m \x1b[32m0/7 bytes\x1b[0m \x1b[31m?\x1b[0m \x1b[32m0/7  \x1b[0m \x1b[32m0 of 7  \x1b[0m \r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2Ktest foo \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m12    \x1b[0m \x1b[32m10    \x1b[0m \x1b[32m12/10  \x1b[0m \x1b[31m1     \x1b[0m \x1b[32m12/10\x1b[0m \x1b[32m12 of  \x1b[0m \x1b[31m1.3    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbyte/s\x1b[0m       \x1b[32m10     \x1b[0m \x1b[31mit/s   \x1b[0m\ntest bar \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m16    \x1b[0m \x1b[32m7     \x1b[0m \x1b[32m16/7   \x1b[0m \x1b[31m2     \x1b[0m \x1b[32m16/7 \x1b[0m \x1b[32m16 of 7\x1b[0m \x1b[31m1.5    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbytes…\x1b[0m               \x1b[31mit/s   \x1b[0m\r\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2Ktest foo \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m12    \x1b[0m \x1b[32m10    \x1b[0m \x1b[32m12/10  \x1b[0m \x1b[31m1     \x1b[0m \x1b[32m12/10\x1b[0m \x1b[32m12 of  \x1b[0m \x1b[31m1.3    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbyte/s\x1b[0m       \x1b[32m10     \x1b[0m \x1b[31mit/s   \x1b[0m\ntest bar \x1b[38;2;114;156;31m━━━━━━\x1b[0m \x1b[36m0:00:…\x1b[0m \x1b[33m0:00:…\x1b[0m \x1b[32m16    \x1b[0m \x1b[32m7     \x1b[0m \x1b[32m16/7   \x1b[0m \x1b[31m2     \x1b[0m \x1b[32m16/7 \x1b[0m \x1b[32m16 of 7\x1b[0m \x1b[31m1.5    \x1b[0m\n                              \x1b[32mbytes \x1b[0m \x1b[32mbytes \x1b[0m \x1b[32mbytes  \x1b[0m \x1b[31mbytes…\x1b[0m               \x1b[31mit/s   \x1b[0m\n\x1b[?25h\r\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K\x1b[1A\x1b[2K"
 
     assert result == expected