Skip to content
Snippets Groups Projects
Commit 5ba4bba0 authored by Simon Will's avatar Simon Will
Browse files

Remove superfluous parentheses after fixture call

parent 97941839
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ Position = azm.model.Position ...@@ -12,7 +12,7 @@ Position = azm.model.Position
TEST_DIR = os.path.dirname(__file__) TEST_DIR = os.path.dirname(__file__)
@pytest.fixture() @pytest.fixture
def verse_models(): def verse_models():
verse_filepath = os.path.join(TEST_DIR, 'verses.json') verse_filepath = os.path.join(TEST_DIR, 'verses.json')
verse_models = azm.model.from_json(verse_filepath) verse_models = azm.model.from_json(verse_filepath)
......
...@@ -13,13 +13,13 @@ SESSION_FACTORY = sessionmaker(bind=ENGINE) ...@@ -13,13 +13,13 @@ SESSION_FACTORY = sessionmaker(bind=ENGINE)
azm.db.BASE.metadata.create_all(ENGINE) azm.db.BASE.metadata.create_all(ENGINE)
@pytest.fixture() @pytest.fixture
def word_list(): def word_list():
word_list = azm.wordlist.WordList(session_factory=SESSION_FACTORY) word_list = azm.wordlist.WordList(session_factory=SESSION_FACTORY)
return word_list return word_list
@pytest.fixture() @pytest.fixture
def tokenized_verses(): def tokenized_verses():
verses = [ verses = [
'nunc dum tibi lubet licetque pota perde rem', 'nunc dum tibi lubet licetque pota perde rem',
......
...@@ -19,20 +19,20 @@ SESSION_FACTORY = sessionmaker(bind=ENGINE) ...@@ -19,20 +19,20 @@ SESSION_FACTORY = sessionmaker(bind=ENGINE)
azm.db.BASE.metadata.create_all(ENGINE) azm.db.BASE.metadata.create_all(ENGINE)
@pytest.fixture() @pytest.fixture
def word_list(): def word_list():
word_list = azm.wordlist.WordList(session_factory=SESSION_FACTORY) word_list = azm.wordlist.WordList(session_factory=SESSION_FACTORY)
return word_list return word_list
@pytest.fixture() @pytest.fixture
def populated_word_list(word_list): def populated_word_list(word_list):
word_list.populate_database(MACRONS_FILE) word_list.populate_database(MACRONS_FILE)
yield word_list yield word_list
word_list.depopulate_database() word_list.depopulate_database()
@pytest.fixture() @pytest.fixture
def loaded_word_list(populated_word_list): def loaded_word_list(populated_word_list):
populated_word_list.load_all_from_db() populated_word_list.load_all_from_db()
populated_word_list.unknown_forms.add(NONEXISTENT_WORD) populated_word_list.unknown_forms.add(NONEXISTENT_WORD)
......
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