From 87e715df7cec956f21f8b490809bebfd48ea988a 2020-07-16 14:39:48 From: Brett Smith Date: 2020-07-16 14:39:48 Subject: [PATCH] tests: Make clean_account_meta a teardown fixture. --- diff --git a/tests/test_data_account.py b/tests/test_data_account.py index 2ef4b4256d65429a47616b1aee629304652221b3..aed5909fcea3fac3c0a9306585592d23a8b9c607 100644 --- a/tests/test_data_account.py +++ b/tests/test_data_account.py @@ -286,7 +286,7 @@ def test_is_account(account_s): 'Income:Donations', 'Liabilities:CreditCard:Visa0123', ]) -def test_is_account(clean_account_meta, account_s): +def test_is_account(account_s): assert data.Account.is_account(account_s) @pytest.mark.parametrize('account_s', [ @@ -298,7 +298,7 @@ def test_is_account(clean_account_meta, account_s): 'Expenses:Banking_Fees', 'Revenue:Grants', ]) -def test_is_not_account(clean_account_meta, account_s): +def test_is_not_account(account_s): assert not data.Account.is_account(account_s) @pytest.mark.parametrize('account_s,expected', [ diff --git a/tests/testutil.py b/tests/testutil.py index e90b3e6bb00798cdc0d25b32c63a8c8d53cd0470..f46b1fcadd55f8562039bbdbc9641758f5d028d9 100644 --- a/tests/testutil.py +++ b/tests/testutil.py @@ -40,10 +40,11 @@ FY_MID_DATE = datetime.date(2020, 9, 1) PAST_DATE = datetime.date(2000, 1, 1) TESTS_DIR = Path(__file__).parent -# This function is primarily used as a fixture, but different test files use +# This function is a teardown fixture, but different test files use # it with different scopes. Typical usage looks like: # clean_account_meta = pytest.fixture([options])(testutil.clean_account_meta) def clean_account_meta(): + yield data.Account.load_options_map(bc_options.OPTIONS_DEFAULTS) data.Account._meta_map.clear()