From 29c5ac71bc3da35ed631719a43af4c45652d62aa Mon Sep 17 00:00:00 2001
From: wim glenn <hey@wimglenn.com>
Date: Wed, 29 Aug 2018 22:58:04 -0500
Subject: [PATCH] improve line width estimate

---
 setup.py                | 2 +-
 src/_pytest/terminal.py | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 6207ad09b..a3125611f 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@ def get_environment_marker_support_level():
 def main():
     extras_require = {}
     install_requires = [
-        "py>=1.5.0",
+        "py>=1.6.0",
         "six>=1.10.0",
         "setuptools",
         "attrs>=17.4.0",
diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
index 746d08c47..48c652bd0 100644
--- a/src/_pytest/terminal.py
+++ b/src/_pytest/terminal.py
@@ -413,7 +413,7 @@ class TerminalReporter(object):
                 self._write_progress_information_filling_space()
             else:
                 past_edge = (
-                    self._tw.chars_on_current_line + self._PROGRESS_LENGTH + 1
+                    self._tw.width_of_current_line + self._PROGRESS_LENGTH + 1
                     >= self._screen_width
                 )
                 if past_edge:
@@ -433,10 +433,8 @@ class TerminalReporter(object):
 
     def _write_progress_information_filling_space(self):
         msg = self._get_progress_information_message()
-        fill = " " * (
-            self._tw.fullwidth - self._tw.chars_on_current_line - len(msg) - 1
-        )
-        self.write(fill + msg, cyan=True)
+        fill = self._tw.fullwidth - self._tw.width_of_current_line - 1
+        self.write(msg.rjust(fill), cyan=True)
 
     def pytest_collection(self):
         if not self.isatty and self.config.option.verbose >= 1: