Skip to content
Snippets Groups Projects
Verified Commit 04e7597c authored by Daniel Hornung's avatar Daniel Hornung
Browse files

WIP: Modernized pytest fixtures a bit, just enough to make it run.

parent 2c766d85
No related branches found
No related tags found
2 merge requests!39Release 0.4.0,!35Pipeline streamlining
Pipeline #19896 failed
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
# ** end header # ** end header
# #
import caosdb as db import caosdb as db
import pytest
from caosadvancedtools import table_export as te from caosadvancedtools import table_export as te
...@@ -85,8 +86,11 @@ def setup_module(): ...@@ -85,8 +86,11 @@ def setup_module():
pass pass
@pytest.fixture(autouse=True)
def setup(): def setup():
"""No further setup""" """Same as module setup."""
setup_module()
yield None
setup_module() setup_module()
......
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
# #
# ** end header # ** end header
"""Test whether the crawler correctly identifies the data model
problems caused by a faulty model. """Test whether the crawler correctly identifies the data model problems caused by a faulty model.
""" """
import caosdb as db import caosdb as db
from caosadvancedtools import loadFiles from caosadvancedtools import loadFiles
from caosadvancedtools.cfood import fileguide from caosadvancedtools.cfood import fileguide
......
...@@ -44,12 +44,15 @@ def setup_module(): ...@@ -44,12 +44,15 @@ def setup_module():
print(delete_exc) print(delete_exc)
@pytest.fixture(autouse=True)
def setup(): def setup():
"""No further setup""" """Same as module setup."""
setup_module()
yield None
setup_module() setup_module()
def teardown(): def teardown_module():
"""Clear and delete again.""" """Clear and delete again."""
setup_module() setup_module()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment