Merge branch 'master' into add_rotest_console

gregoil · Jun 9, 2018 · 9b7a61d · 9b7a61d
2 parents 9174096 + 31f9275
commit 9b7a61d
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/rotest/core/utils/pretty.py b/src/rotest/core/utils/pretty.py
@@ -308,10 +308,7 @@ def _test_type_uncolored(self):
                         "unsupported type" % self.test)
 
     def _test_name_uncolored(self):
-        if hasattr(self.test, "name"):
-            return self.test.name
-
-        return self.test.__class__.__name__
+        return self.test.data.name
 
     def _test_result_uncolored(self):
         return str(self.result).capitalize()
@@ -350,7 +347,7 @@ def get_columns():
     if sys.platform in ("linux", "linux2", "darwin"):
         # Both OS X (darwin) and Linux support the 'stty' command
         try:
-            _, columns = os.popen("stty size").read().split()
+            _, columns = os.popen("stty size 2>/dev/null").read().split()
             columns = int(columns)
             return columns