[Piglit] [PATCH 28/44] status_tests.py: drop bytes tests, status doesn't support bytes anymore

baker.dylan.c at gmail.com baker.dylan.c at gmail.com
Wed Jan 27 16:06:36 PST 2016


From: Dylan Baker <baker.dylan.c at gmail.com>

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 unittests/status_tests.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/unittests/status_tests.py b/unittests/status_tests.py
index b76d5b5..00f00e8 100644
--- a/unittests/status_tests.py
+++ b/unittests/status_tests.py
@@ -31,6 +31,7 @@ from __future__ import (
 import itertools
 
 import nose.tools as nt
+import six
 
 import framework.status as status
 from . import utils
@@ -234,8 +235,7 @@ def test_nochangestatus_magic():
     # generator equality tests
     for comp, type_ in [(obj, 'status.NoChangeStatus'),
                         (stat, 'status.Status'),
-                        (u'Test', 'unicode'),
-                        ('Test', 'str')]:
+                        ('Test', 'unicode')]:
         check_operator_equal.description = (
             'Status.NoChangeStatus: Operator eq works with type: {}'.format(type_)
         )
@@ -254,8 +254,7 @@ def test_status_magic():
     comparitor = status.Status('bar', 10, (0, 0))
 
     for func, name, result in [
-            (str, 'str', 'foo'),
-            (unicode, 'unicode', u'foo'),
+            (six.text_type, 'unicode', 'foo'),
             (repr, 'repr', 'foo'),
             (int, 'int', 0)]:
         check_operator.description = \
-- 
2.7.0



More information about the Piglit mailing list