Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Improve test cleanup. #234

Merged
merged 1 commit into from
Nov 7, 2019
Merged

fix: Improve test cleanup. #234

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
59 changes: 20 additions & 39 deletions tests/system/test_crud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ class SomeKind(ndb.Model):

entity = SomeKind(foo=42, bar="none")
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == 42
Expand All @@ -228,8 +229,6 @@ class SomeKind(ndb.Model):
ds_entity = ds_client.get(key._key)
assert ds_entity["bar"] == "none"

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_insert_entity_with_stored_name_property(dispose_of, ds_client):
Expand All @@ -239,6 +238,7 @@ class SomeKind(ndb.Model):

entity = SomeKind(foo="something", bar="or other")
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == "something"
Expand All @@ -247,8 +247,6 @@ class SomeKind(ndb.Model):
ds_entity = ds_client.get(key._key)
assert ds_entity["notbar"] == "or other"

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_insert_roundtrip_naive_datetime(dispose_of, ds_client):
Expand All @@ -257,12 +255,11 @@ class SomeKind(ndb.Model):

entity = SomeKind(foo=datetime.datetime(2010, 5, 12, 2, 42))
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == datetime.datetime(2010, 5, 12, 2, 42)

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_datetime_w_tzinfo(dispose_of, ds_client):
Expand All @@ -287,13 +284,12 @@ class SomeKind(ndb.Model):
bar=datetime.datetime(2010, 5, 12, 2, 42),
)
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == datetime.datetime(2010, 5, 12, 3, 42, tzinfo=mytz)
assert retrieved.bar == datetime.datetime(2010, 5, 11, 22, 42, tzinfo=mytz)

dispose_of(key._key)


def test_parallel_threads(dispose_of, namespace):
client = ndb.Client(namespace=namespace)
Expand All @@ -307,13 +303,12 @@ def insert(foo):
entity = SomeKind(foo=foo, bar="none")

key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == foo
assert retrieved.bar == "none"

dispose_of(key._key)

thread1 = threading.Thread(target=insert, args=[42], name="one")
thread2 = threading.Thread(target=insert, args=[144], name="two")

Expand All @@ -332,12 +327,11 @@ class SomeKind(ndb.Model):
foo = {str(i): i for i in range(500)}
entity = SomeKind(foo=foo)
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == foo

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_compressed_json_property(dispose_of, ds_client):
Expand All @@ -347,12 +341,11 @@ class SomeKind(ndb.Model):
foo = {str(i): i for i in range(500)}
entity = SomeKind(foo=foo)
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == foo

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_compressed_blob_property(dispose_of, ds_client):
Expand All @@ -362,12 +355,11 @@ class SomeKind(ndb.Model):
foo = b"abc" * 100
entity = SomeKind(foo=foo)
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == foo

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_retrieve_entity_with_legacy_compressed_property(
Expand Down Expand Up @@ -399,12 +391,11 @@ class SomeKind(ndb.Model):
foo = {str(i): i for i in range(500)}
entity = SomeKind(foo=foo)
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == foo

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_key_property(dispose_of, ds_client):
Expand All @@ -414,14 +405,13 @@ class SomeKind(ndb.Model):
key_value = ndb.Key("Whatevs", 123)
entity = SomeKind(foo=key_value)
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == key_value

dispose_of(key._key)


def test_insert_entity_with_caching(dispose_of, client_context):
def test_insert_entity_with_caching(client_context):
class SomeKind(ndb.Model):
foo = ndb.IntegerProperty()
bar = ndb.StringProperty()
Expand Down Expand Up @@ -454,6 +444,7 @@ class SomeKind(ndb.Model):

entity = SomeKind(foo=42, bar="none")
key = entity.put()
dispose_of(key._key)
cache_key = _cache.global_cache_key(key._key)
assert not cache_dict

Expand All @@ -470,8 +461,6 @@ class SomeKind(ndb.Model):
# entity on write rather than waiting for a subsequent lookup.
assert cache_key not in cache_dict

dispose_of(key._key)


@pytest.mark.skipif(not USE_REDIS_CACHE, reason="Redis is not configured")
def test_insert_entity_with_redis_cache(dispose_of, client_context):
Expand All @@ -485,6 +474,7 @@ class SomeKind(ndb.Model):

entity = SomeKind(foo=42, bar="none")
key = entity.put()
dispose_of(key._key)
cache_key = _cache.global_cache_key(key._key)
assert global_cache.redis.get(cache_key) is None

Expand All @@ -501,8 +491,6 @@ class SomeKind(ndb.Model):
# entity on write rather than waiting for a subsequent lookup.
assert global_cache.redis.get(cache_key) is None

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_update_entity(ds_entity):
Expand Down Expand Up @@ -760,9 +748,8 @@ class SomeKind(ndb.Model):
assert SomeKind.get_by_id(name) is None

entity = SomeKind.get_or_insert(name, foo=21)
assert entity.foo == 21

dispose_of(entity._key._key)
assert entity.foo == 21


@pytest.mark.usefixtures("client_context")
Expand Down Expand Up @@ -793,6 +780,7 @@ class SomeKind(ndb.Model):

entity = SomeKind(foo=42, bar=OtherKind(one="hi", two="mom"))
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == 42
Expand All @@ -801,8 +789,6 @@ class SomeKind(ndb.Model):

assert isinstance(retrieved.bar, OtherKind)

dispose_of(key._key)


def test_insert_entity_with_structured_property_legacy_data(
client_context, dispose_of, ds_client
Expand All @@ -818,6 +804,7 @@ class SomeKind(ndb.Model):
with client_context.new(legacy_data=True).use():
entity = SomeKind(foo=42, bar=OtherKind(one="hi", two="mom"))
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == 42
Expand All @@ -831,8 +818,6 @@ class SomeKind(ndb.Model):
assert ds_entity["bar.one"] == "hi"
assert ds_entity["bar.two"] == "mom"

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_retrieve_entity_with_legacy_structured_property(ds_entity):
Expand Down Expand Up @@ -895,13 +880,12 @@ class SomeKind(ndb.Expando):
entity = SomeKind(foo=42)
entity.expando_prop = "exp-value"
key = entity.put()
dispose_of(key._key)

retrieved = key.get()
assert retrieved.foo == 42
assert retrieved.expando_prop == "exp-value"

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_insert_polymodel(dispose_of):
Expand All @@ -916,6 +900,7 @@ class Cat(Feline):

entity = Cat(one="hello", two="dad", three="i'm in jail")
key = entity.put()
dispose_of(key._key)

retrieved = key.get()

Expand All @@ -925,8 +910,6 @@ class Cat(Feline):
assert retrieved.two == "dad"
assert retrieved.three == "i'm in jail"

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_insert_autonow_property(dispose_of):
Expand All @@ -937,14 +920,13 @@ class SomeKind(ndb.Model):

entity = SomeKind(foo="bar")
key = entity.put()
dispose_of(key._key)

retrieved = key.get()

assert isinstance(retrieved.created_at, datetime.datetime)
assert isinstance(retrieved.updated_at, datetime.datetime)

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_insert_nested_autonow_property(dispose_of):
Expand All @@ -957,14 +939,13 @@ class SomeKind(ndb.Model):

entity = SomeKind(other=OtherKind())
key = entity.put()
dispose_of(key._key)

retrieved = key.get()

assert isinstance(retrieved.other.created_at, datetime.datetime)
assert isinstance(retrieved.other.updated_at, datetime.datetime)

dispose_of(key._key)


@pytest.mark.usefixtures("client_context")
def test_uninitialized_property(dispose_of):
Expand Down
Loading