diff options
Diffstat (limited to 'tests/conftest.py')
-rw-r--r-- | tests/conftest.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 1922d1d40..6bc801bac 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,6 +3,7 @@ import pytest from tests.components.bank import Bank from tests.components.config import Config from tests.components.exchange import Exchange +from tests.components.merchant import Merchant from tests.components.wallet import Wallet @@ -26,5 +27,12 @@ def bank(watcher_getter, request, config): @pytest.fixture +def merchant(watcher_getter, request, config): + merchant = Merchant(config, watcher_getter, request) + merchant.start() + return merchant + + +@pytest.fixture def wallet(watcher_getter, config): return Wallet(config) |