URL: https://github.com/freeipa/freeipa/pull/636
Author: tiran
Title: #636: [Py3] Fix ipatests.util doc tests
Action: opened
PR body:
"""
Doctests of ipatests.util fail under Python 3.
The old test scenario does no longer work on Python 3 since u'how are you'
and 'how are you' have identical type, but u'how are you' != b'how are you'.
It works with int / float on all Python versions.
Python 2 has <type 'int'> while Python 3 uses <class 'int'>.
Signed-off-by: Christian Heimes <chei...@redhat.com>
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/636/head:pr636
git checkout pr636
From 4562c992e8362cb8e9ad28e1a18767bd183a14ef Mon Sep 17 00:00:00 2001
From: Christian Heimes <chei...@redhat.com>
Date: Wed, 22 Mar 2017 11:49:05 +0100
Subject: [PATCH] [Py3] Fix ipatests.util doc tests
Doctests of ipatests.util fail under Python 3.
The old test scenario does no longer work on Python 3 since u'how are you'
and 'how are you' have identical type, but u'how are you' != b'how are you'.
It works with int / float on all Python versions.
Python 2 has <type 'int'> while Python 3 uses <class 'int'>.
Signed-off-by: Christian Heimes <chei...@redhat.com>
---
ipatests/util.py | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/ipatests/util.py b/ipatests/util.py
index 4379c30..0e7d2b8 100644
--- a/ipatests/util.py
+++ b/ipatests/util.py
@@ -178,9 +178,9 @@ class Fuzzy(object):
Use of a regular expression by default implies the ``unicode`` type, so
comparing with an ``str`` instance will evaluate to ``False``:
- >>> phone.type
- <type 'unicode'>
- >>> '123-456-7890' == phone
+ >>> phone.type is six.text_type
+ True
+ >>> b'123-456-7890' == phone
False
The *type* kwarg allows you to specify a type constraint, so you can force
@@ -220,15 +220,15 @@ class Fuzzy(object):
>>> fuzzy = Fuzzy('.+', type=str, test=lambda other: True)
>>> fuzzy.regex
'.+'
- >>> fuzzy.type
- <type 'str'>
+ >>> fuzzy.type is str
+ True
>>> fuzzy.test # doctest:+ELLIPSIS
<function <lambda> at 0x...>
To aid debugging, `Fuzzy.__repr__()` reveals these kwargs as well:
>>> fuzzy # doctest:+ELLIPSIS
- Fuzzy('.+', <type 'str'>, <function <lambda> at 0x...>)
+ Fuzzy('.+', <... 'str'>, <function <lambda> at 0x...>)
"""
def __init__(self, regex=None, type=None, test=None):
@@ -328,20 +328,20 @@ def assert_deepequal(expected, got, doc='', stack=tuple()):
If the tests fails, it will raise an ``AssertionError`` with detailed
information, including the path to the offending value. For example:
- >>> expected = [u'Hello', dict(world=u'how are you?')]
- >>> got = [u'Hello', dict(world='how are you?')]
+ >>> expected = [u'Hello', dict(world=1)]
+ >>> got = [u'Hello', dict(world=1.0)]
>>> expected == got
True
- >>> assert_deepequal(expected, got, doc='Testing my nested data')
+ >>> assert_deepequal(expected, got, doc='Testing my nested data') # doctest:+ELLIPSIS
Traceback (most recent call last):
...
AssertionError: assert_deepequal: type(expected) is not type(got).
Testing my nested data
- type(expected) = <type 'unicode'>
- type(got) = <type 'str'>
- expected = u'how are you?'
- got = 'how are you?'
- path = (0, 'world')
+ type(expected) = <... 'int'>
+ type(got) = <... 'float'>
+ expected = 1
+ got = 1.0
+ path = (..., 'world')
Note that lists and tuples are considered equivalent, and the order of
their elements does not matter.
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
