Author: Ronan Lamy <[email protected]>
Branch: py3.5
Changeset: r92932:186f4b89a84a
Date: 2017-11-04 21:13 +0000
http://bitbucket.org/pypy/pypy/changeset/186f4b89a84a/
Log: Kill tests involving dodgy comparisons with CPython 2 and superseded
by b97f900404e5
diff --git a/pypy/objspace/std/test/test_bytesobject.py
b/pypy/objspace/std/test/test_bytesobject.py
--- a/pypy/objspace/std/test/test_bytesobject.py
+++ b/pypy/objspace/std/test/test_bytesobject.py
@@ -100,77 +100,6 @@
assert space.str_w(w_res) == '*'
-try:
- from hypothesis import given, strategies
-except ImportError:
- pass
-else:
- @given(u=strategies.binary(),
- 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
-
- 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
-
- 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, 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, 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 AppTestBytesObject:
def setup_class(cls):
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
@@ -39,55 +39,6 @@
space.raises_w(space.w_UnicodeEncodeError, space.text_w, w_uni)
-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,
- 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))
- 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
-
- w_index = space.call_method(w_u, 'rfind', w_v,
- space.newint(start),
- space.newint(start + len1))
- assert space.int_w(w_index) == rexpected
-
-
class AppTestUnicodeStringStdOnly:
def test_compares(self):
assert type('a') != type(b'a')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
