Author: Matti Picus <[email protected]>
Branch: unicode-utf8
Changeset: r95551:381c99955a5c
Date: 2019-01-01 12:26 +0200
http://bitbucket.org/pypy/pypy/changeset/381c99955a5c/
Log: skip hypothesis (on -A testing)
diff --git a/pypy/interpreter/test/test_unicodehelper.py
b/pypy/interpreter/test/test_unicodehelper.py
--- a/pypy/interpreter/test/test_unicodehelper.py
+++ b/pypy/interpreter/test/test_unicodehelper.py
@@ -1,5 +1,9 @@
import pytest
-from hypothesis import given, strategies
+try:
+ from hypothesis import given, strategies
+ HAS_HYPOTHESIS = True
+except ImportError:
+ HAS_HYPOTHESIS = False
import struct
import sys
@@ -37,12 +41,14 @@
assert lst == [("??", "ascii", input, 0, 2),
("??", "ascii", input, 5, 7)]
-@given(strategies.text())
-def test_utf8_encode_ascii_2(u):
- def eh(errors, encoding, reason, p, start, end):
- return "?" * (end - start), end
+if HAS_HYPOTHESIS:
+ @given(strategies.text())
+ def test_utf8_encode_ascii_2(u):
+ def eh(errors, encoding, reason, p, start, end):
+ return "?" * (end - start), end
- assert utf8_encode_ascii(u.encode("utf8"), "replace", eh) ==
u.encode("ascii", "replace")
+ assert utf8_encode_ascii(u.encode("utf8"),
+ "replace", eh) == u.encode("ascii", "replace")
def test_str_decode_ascii():
assert str_decode_ascii("abc", "??", True, "??") == ("abc", 3, 3)
diff --git a/pypy/module/_cffi_backend/test/test_wchar_helper.py
b/pypy/module/_cffi_backend/test/test_wchar_helper.py
--- a/pypy/module/_cffi_backend/test/test_wchar_helper.py
+++ b/pypy/module/_cffi_backend/test/test_wchar_helper.py
@@ -1,10 +1,15 @@
-from hypothesis import given, strategies
+try:
+ from hypothesis import given, strategies
+ HAS_HYPOTHESIS = True
+except ImportError:
+ HAS_HYPOTHESIS = False
+
from pypy.module._cffi_backend.wchar_helper import utf8_size_as_char16
-
-@given(strategies.text())
-def test_utf8_size_as_char16(u):
- assert type(u) is unicode
- length = utf8_size_as_char16(''.join(uc.encode('utf8') for uc in u))
- assert length == sum((1 if uc <= u'\uFFFF' else 2) for uc in u)
+if HAS_HYPOTHESIS:
+ @given(strategies.text())
+ def test_utf8_size_as_char16(u):
+ assert type(u) is unicode
+ length = utf8_size_as_char16(''.join(uc.encode('utf8') for uc in u))
+ assert length == sum((1 if uc <= u'\uFFFF' else 2) for uc in u)
diff --git a/pypy/objspace/std/test/test_unicodeobject.py
b/pypy/objspace/std/test/test_unicodeobject.py
--- a/pypy/objspace/std/test/test_unicodeobject.py
+++ b/pypy/objspace/std/test/test_unicodeobject.py
@@ -1,7 +1,12 @@
# -*- encoding: utf-8 -*-
import py
import sys
-from hypothesis import given, strategies, settings, example
+try:
+ from hypothesis import given, strategies, settings, example
+ HAS_HYPOTHESIS = True
+except ImportError:
+ HAS_HYPOTHESIS = False
+
from rpython.rlib import rutf8
from pypy.interpreter.error import OperationError
@@ -36,141 +41,137 @@
space.w_unicode, "__new__", space.w_unicode, w_uni)
assert w_new is w_uni
- @given(strategies.text(), strategies.integers(min_value=0, max_value=10),
- strategies.integers(min_value=-1, max_value=10))
- def test_hypo_index_find(self, u, start, len1):
- if start + len1 < 0:
- return # skip this case
- v = u[start : start + len1]
- space = self.space
- w_u = space.newutf8(u.encode('utf8'), len(u))
- w_v = space.newutf8(v.encode('utf8'), len(v))
- expected = u.find(v, start, start + len1)
- try:
- w_index = space.call_method(w_u, 'index', w_v,
+ if HAS_HYPOTHESIS:
+ @given(strategies.text(), strategies.integers(min_value=0,
max_value=10),
+ strategies.integers(min_value=-1,
max_value=10))
+ def test_hypo_index_find(self, u, start, len1):
+ if start + len1 < 0:
+ return # skip this case
+ v = u[start : start + len1]
+ space = self.space
+ w_u = space.newutf8(u.encode('utf8'), len(u))
+ w_v = space.newutf8(v.encode('utf8'), len(v))
+ expected = u.find(v, start, start + len1)
+ try:
+ w_index = space.call_method(w_u, 'index', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ except OperationError as e:
+ if not e.match(space, space.w_ValueError):
+ raise
+ assert expected == -1
+ else:
+ assert space.int_w(w_index) == expected >= 0
+
+ w_index = space.call_method(w_u, 'find', w_v,
space.newint(start),
space.newint(start + len1))
- except OperationError as e:
- if not e.match(space, space.w_ValueError):
- raise
- assert expected == -1
- else:
- assert space.int_w(w_index) == expected >= 0
+ assert space.int_w(w_index) == expected
- w_index = space.call_method(w_u, 'find', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert space.int_w(w_index) == expected
+ rexpected = u.rfind(v, start, start + len1)
+ try:
+ w_index = space.call_method(w_u, 'rindex', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ except OperationError as e:
+ if not e.match(space, space.w_ValueError):
+ raise
+ assert rexpected == -1
+ else:
+ assert space.int_w(w_index) == rexpected >= 0
- rexpected = u.rfind(v, start, start + len1)
- try:
- w_index = space.call_method(w_u, 'rindex', w_v,
+ w_index = space.call_method(w_u, 'rfind', w_v,
space.newint(start),
space.newint(start + len1))
- except OperationError as e:
- if not e.match(space, space.w_ValueError):
- raise
- assert rexpected == -1
- else:
- assert space.int_w(w_index) == rexpected >= 0
+ assert space.int_w(w_index) == rexpected
- w_index = space.call_method(w_u, 'rfind', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert space.int_w(w_index) == rexpected
+ expected = u.startswith(v, start)
+ w_res = space.call_method(w_u, 'startswith', w_v,
+ space.newint(start))
+ assert w_res is space.newbool(expected)
- expected = u.startswith(v, start)
- w_res = space.call_method(w_u, 'startswith', w_v,
- space.newint(start))
- assert w_res is space.newbool(expected)
+ expected = u.startswith(v, start, start + len1)
+ w_res = space.call_method(w_u, 'startswith', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ assert w_res is space.newbool(expected)
- expected = u.startswith(v, start, start + len1)
- w_res = space.call_method(w_u, 'startswith', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert w_res is space.newbool(expected)
+ expected = u.endswith(v, start)
+ w_res = space.call_method(w_u, 'endswith', w_v,
+ space.newint(start))
+ assert w_res is space.newbool(expected)
- expected = u.endswith(v, start)
- w_res = space.call_method(w_u, 'endswith', w_v,
- space.newint(start))
- assert w_res is space.newbool(expected)
+ expected = u.endswith(v, start, start + len1)
+ w_res = space.call_method(w_u, 'endswith', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ assert w_res is space.newbool(expected)
- expected = u.endswith(v, start, start + len1)
- w_res = space.call_method(w_u, 'endswith', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert w_res is space.newbool(expected)
+ @given(u=strategies.text(),
+ start=strategies.integers(min_value=0, max_value=10),
+ len1=strategies.integers(min_value=-1, max_value=10))
+ def test_hypo_index_find(u, start, len1, space):
+ if start + len1 < 0:
+ return # skip this case
+ v = u[start : start + len1]
+ w_u = space.wrap(u)
+ w_v = space.wrap(v)
+ expected = u.find(v, start, start + len1)
+ try:
+ w_index = space.call_method(w_u, 'index', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ except OperationError as e:
+ if not e.match(space, space.w_ValueError):
+ raise
+ assert expected == -1
+ else:
+ assert space.int_w(w_index) == expected >= 0
-try:
- from hypothesis import given, strategies
-except ImportError:
- pass
-else:
- @given(u=strategies.text(),
- start=strategies.integers(min_value=0, max_value=10),
- len1=strategies.integers(min_value=-1, max_value=10))
- def test_hypo_index_find(u, start, len1, space):
- if start + len1 < 0:
- return # skip this case
- v = u[start : start + len1]
- w_u = space.wrap(u)
- w_v = space.wrap(v)
- expected = u.find(v, start, start + len1)
- try:
- w_index = space.call_method(w_u, 'index', w_v,
+ w_index = space.call_method(w_u, 'find', w_v,
space.newint(start),
space.newint(start + len1))
- except OperationError as e:
- if not e.match(space, space.w_ValueError):
- raise
- assert expected == -1
- else:
- assert space.int_w(w_index) == expected >= 0
+ assert space.int_w(w_index) == expected
- w_index = space.call_method(w_u, 'find', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert space.int_w(w_index) == expected
+ rexpected = u.rfind(v, start, start + len1)
+ try:
+ w_index = space.call_method(w_u, 'rindex', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ except OperationError as e:
+ if not e.match(space, space.w_ValueError):
+ raise
+ assert rexpected == -1
+ else:
+ assert space.int_w(w_index) == rexpected >= 0
- rexpected = u.rfind(v, start, start + len1)
- try:
- w_index = space.call_method(w_u, 'rindex', w_v,
+ w_index = space.call_method(w_u, 'rfind', w_v,
space.newint(start),
space.newint(start + len1))
- except OperationError as e:
- if not e.match(space, space.w_ValueError):
- raise
- assert rexpected == -1
- else:
- assert space.int_w(w_index) == rexpected >= 0
+ assert space.int_w(w_index) == rexpected
- w_index = space.call_method(w_u, 'rfind', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert space.int_w(w_index) == rexpected
+ expected = u.startswith(v, start)
+ w_res = space.call_method(w_u, 'startswith', w_v,
+ space.newint(start))
+ assert w_res is space.newbool(expected)
- expected = u.startswith(v, start)
- w_res = space.call_method(w_u, 'startswith', w_v,
- space.newint(start))
- assert w_res is space.newbool(expected)
+ expected = u.startswith(v, start, start + len1)
+ w_res = space.call_method(w_u, 'startswith', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ assert w_res is space.newbool(expected)
- expected = u.startswith(v, start, start + len1)
- w_res = space.call_method(w_u, 'startswith', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert w_res is space.newbool(expected)
+ expected = u.endswith(v, start)
+ w_res = space.call_method(w_u, 'endswith', w_v,
+ space.newint(start))
+ assert w_res is space.newbool(expected)
- expected = u.endswith(v, start)
- w_res = space.call_method(w_u, 'endswith', w_v,
- space.newint(start))
- assert w_res is space.newbool(expected)
-
- expected = u.endswith(v, start, start + len1)
- w_res = space.call_method(w_u, 'endswith', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert w_res is space.newbool(expected)
+ expected = u.endswith(v, start, start + len1)
+ w_res = space.call_method(w_u, 'endswith', w_v,
+ space.newint(start),
+ space.newint(start + len1))
+ assert w_res is space.newbool(expected)
class AppTestUnicodeStringStdOnly:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
