fixed connection closing issues in fixtures
This commit is contained in:
9
tests/fixtures/auth_fixtures.py
vendored
9
tests/fixtures/auth_fixtures.py
vendored
@@ -28,6 +28,9 @@ def test_user(db, auth_manager):
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
# Expunge user from session to prevent ResourceWarning about unclosed connections
|
||||
# This detaches the object from the session so it doesn't hold a reference
|
||||
db.expunge(user)
|
||||
return user
|
||||
|
||||
|
||||
@@ -46,6 +49,8 @@ def test_admin(db, auth_manager):
|
||||
db.add(admin)
|
||||
db.commit()
|
||||
db.refresh(admin)
|
||||
# Expunge admin from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(admin)
|
||||
return admin
|
||||
|
||||
@pytest.fixture
|
||||
@@ -63,6 +68,8 @@ def another_admin(db, auth_manager):
|
||||
db.add(admin)
|
||||
db.commit()
|
||||
db.refresh(admin)
|
||||
# Expunge admin from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(admin)
|
||||
return admin
|
||||
|
||||
@pytest.fixture
|
||||
@@ -80,6 +87,8 @@ def other_user(db, auth_manager):
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
# Expunge user from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(user)
|
||||
return user
|
||||
|
||||
|
||||
|
||||
4
tests/fixtures/customer_fixtures.py
vendored
4
tests/fixtures/customer_fixtures.py
vendored
@@ -18,6 +18,8 @@ def test_customer(db, test_vendor):
|
||||
db.add(customer)
|
||||
db.commit()
|
||||
db.refresh(customer)
|
||||
# Expunge customer from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(customer)
|
||||
return customer
|
||||
|
||||
|
||||
@@ -39,4 +41,6 @@ def test_customer_address(db, test_vendor, test_customer):
|
||||
db.add(address)
|
||||
db.commit()
|
||||
db.refresh(address)
|
||||
# Expunge address from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(address)
|
||||
return address
|
||||
|
||||
@@ -22,6 +22,8 @@ def test_marketplace_import_job(db, test_vendor, test_user):
|
||||
db.add(job)
|
||||
db.commit()
|
||||
db.refresh(job)
|
||||
# Expunge job from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(job)
|
||||
return job
|
||||
|
||||
|
||||
@@ -46,4 +48,6 @@ def create_test_marketplace_import_job(db, vendor_id, user_id, **kwargs):
|
||||
db.add(job)
|
||||
db.commit()
|
||||
db.refresh(job)
|
||||
# Expunge job from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(job)
|
||||
return job
|
||||
|
||||
@@ -24,6 +24,8 @@ def test_marketplace_product(db):
|
||||
db.add(marketplace_product)
|
||||
db.commit()
|
||||
db.refresh(marketplace_product)
|
||||
# Expunge marketplace_product from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(marketplace_product)
|
||||
return marketplace_product
|
||||
|
||||
|
||||
@@ -47,6 +49,8 @@ def unique_product(db):
|
||||
db.add(marketplace_product)
|
||||
db.commit()
|
||||
db.refresh(marketplace_product)
|
||||
# Expunge marketplace_product from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(marketplace_product)
|
||||
return marketplace_product
|
||||
|
||||
|
||||
@@ -75,6 +79,8 @@ def multiple_products(db):
|
||||
db.commit()
|
||||
for product in marketplace_products:
|
||||
db.refresh(product)
|
||||
# Expunge each product from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(product)
|
||||
return marketplace_products
|
||||
|
||||
|
||||
@@ -97,6 +103,8 @@ def create_unique_marketplace_product_factory():
|
||||
db.add(marketplace_product)
|
||||
db.commit()
|
||||
db.refresh(marketplace_product)
|
||||
# Expunge marketplace_product from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(marketplace_product)
|
||||
return marketplace_product
|
||||
|
||||
return _marketplace_create_product
|
||||
|
||||
14
tests/fixtures/vendor_fixtures.py
vendored
14
tests/fixtures/vendor_fixtures.py
vendored
@@ -22,6 +22,8 @@ def test_vendor(db, test_user):
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@@ -41,6 +43,8 @@ def unique_vendor(db, test_user):
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@@ -59,6 +63,8 @@ def inactive_vendor(db, other_user):
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@@ -77,6 +83,8 @@ def verified_vendor(db, other_user):
|
||||
db.add(vendor)
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
# Expunge vendor from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(vendor)
|
||||
return vendor
|
||||
|
||||
|
||||
@@ -94,6 +102,8 @@ def test_product(db, test_vendor, unique_product):
|
||||
db.add(product)
|
||||
db.commit()
|
||||
db.refresh(product)
|
||||
# Expunge product from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(product)
|
||||
return product
|
||||
|
||||
|
||||
@@ -112,6 +122,8 @@ def test_inventory(db, test_product):
|
||||
db.add(inventory)
|
||||
db.commit()
|
||||
db.refresh(inventory)
|
||||
# Expunge inventory from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(inventory)
|
||||
return inventory
|
||||
|
||||
|
||||
@@ -133,6 +145,8 @@ def multiple_inventory_entries(db, multiple_products, test_vendor):
|
||||
db.commit()
|
||||
for inventory in inventory_entries:
|
||||
db.refresh(inventory)
|
||||
# Expunge each inventory from session to prevent ResourceWarning about unclosed connections
|
||||
db.expunge(inventory)
|
||||
return inventory_entries
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user