test: Remove Py2-only test code by bw-yuhogg · Pull Request #854 · googleapis/python-ndb · GitHub
Skip to content
This repository was archived by the owner on May 6, 2026. It is now read-only.

test: Remove Py2-only test code #854

Merged
parthea merged 1 commit into from
Dec 14, 2022
Merged

test: Remove Py2-only test code #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions tests/unit/test__gql.py
View file
Open in desktop
21 changes: 3 additions & 18 deletions tests/unit/test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import datetime
import pickle
import pytz
import six
import types
import zlib

Expand Down Expand Up @@ -971,12 +970,6 @@ def test__find_methods(self):

methods = SomeProperty._find_methods("IN", "find_me")
expected = [SomeProperty.IN, SomeProperty.find_me, model.Property.IN]
if six.PY2: # pragma: NO PY3 COVER # pragma: NO BRANCH
expected = [
SomeProperty.IN.__func__,
SomeProperty.find_me.__func__,
model.Property.IN.__func__,
]
assert methods == expected
# Check cache
key = "{}.{}".format(SomeProperty.__module__, SomeProperty.__name__)
Expand All @@ -989,12 +982,6 @@ def test__find_methods_reverse(self):

methods = SomeProperty._find_methods("IN", "find_me", reverse=True)
expected = [model.Property.IN, SomeProperty.find_me, SomeProperty.IN]
if six.PY2: # pragma: NO PY3 COVER # pragma: NO BRANCH
expected = [
model.Property.IN.__func__,
SomeProperty.find_me.__func__,
SomeProperty.IN.__func__,
]
assert methods == expected
# Check cache
key = "{}.{}".format(SomeProperty.__module__, SomeProperty.__name__)
Expand Down Expand Up @@ -2340,9 +2327,8 @@ def test___lt__(self):
assert not user_value1 < user_value1
assert user_value1 < user_value2
assert user_value1 < user_value3
if six.PY3: # pragma: NO PY2 COVER # pragma: NO BRANCH
with pytest.raises(TypeError):
user_value1 < user_value4
with pytest.raises(TypeError):
user_value1 < user_value4

@staticmethod
def test__from_ds_entity():
Expand Down Expand Up @@ -5990,8 +5976,7 @@ def test_str_bytestr_meaning():
assert prop._legacy_db_get_value(v, p) == b"foo"

@staticmethod
@pytest.mark.skipif(six.PY2, reason="Test for Python 3 only.")
def test_str_utf8(): # pragma: NO PY2 COVER
def test_str_utf8():
prop = model.Property()
p = _legacy_entity_pb.Property()
v = _legacy_entity_pb.PropertyValue()
Expand Down
9 changes: 0 additions & 9 deletions tests/unit/test_query.py
View file
Open in desktop