Skip to content

Commit c593a51

Browse files
committed
test: update tests
1 parent 73eef15 commit c593a51

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

tests/conftest.py

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ def init_portfolio_values():
108108
inflation=True,
109109
rebalancing_period="year",
110110
symbol="pf1.PF",
111-
cashflow=0,
112-
initial_amount=1_000,
113-
discount_rate=None,
114111
)
115112

116113

@@ -156,40 +153,40 @@ def portfolio_dividends(init_portfolio_values):
156153

157154

158155
# DCF Scenarios
159-
@pytest.fixture(scope="package")
160-
def portfolio_cashflows_inflation(init_portfolio_values):
161-
_portfolio_cashflows_inflation = deepcopy(init_portfolio_values)
162-
_portfolio_cashflows_inflation["cashflow"] = -100
163-
_portfolio_cashflows_inflation["initial_amount"] = 100_000
164-
return ok.Portfolio(**_portfolio_cashflows_inflation)
165-
166-
167-
@pytest.fixture(scope="package")
168-
def portfolio_cashflows_NO_inflation(init_portfolio_values):
169-
_portfolio_cashflows_NO_inflation = deepcopy(init_portfolio_values)
170-
_portfolio_cashflows_NO_inflation["cashflow"] = -100.0
171-
_portfolio_cashflows_NO_inflation["initial_amount"] = 100_000.0
172-
_portfolio_cashflows_NO_inflation["inflation"] = False
173-
_portfolio_cashflows_NO_inflation["discount_rate"] = 0.09
174-
return ok.Portfolio(**_portfolio_cashflows_NO_inflation)
175-
176-
177-
@pytest.fixture(scope="package")
178-
def portfolio_cashflows_NO_inflation_NO_discount_rate(init_portfolio_values):
179-
_portfolio_cashflows_NO_inflation_NO_discount_rate = deepcopy(init_portfolio_values)
180-
_portfolio_cashflows_NO_inflation_NO_discount_rate["cashflow"] = -100.0
181-
_portfolio_cashflows_NO_inflation_NO_discount_rate["initial_amount"] = 100_000.0
182-
_portfolio_cashflows_NO_inflation_NO_discount_rate["inflation"] = False
183-
_portfolio_cashflows_NO_inflation_NO_discount_rate["discount_rate"] = None
184-
return ok.Portfolio(**_portfolio_cashflows_NO_inflation_NO_discount_rate)
185-
186-
187-
@pytest.fixture(scope="package")
188-
def portfolio_cashflows_inflation_large_cf(init_portfolio_values):
189-
_portfolio_cashflows_inflation_large_cf = deepcopy(init_portfolio_values)
190-
_portfolio_cashflows_inflation_large_cf["cashflow"] = -2000
191-
_portfolio_cashflows_inflation_large_cf["initial_amount"] = 100_000
192-
return ok.Portfolio(**_portfolio_cashflows_inflation_large_cf)
156+
# @pytest.fixture(scope="package")
157+
# def portfolio_cashflows_inflation(init_portfolio_values):
158+
# _portfolio_cashflows_inflation = deepcopy(init_portfolio_values)
159+
# _portfolio_cashflows_inflation["cashflow"] = -100
160+
# _portfolio_cashflows_inflation["initial_amount"] = 100_000
161+
# return ok.Portfolio(**_portfolio_cashflows_inflation)
162+
#
163+
#
164+
# @pytest.fixture(scope="package")
165+
# def portfolio_cashflows_NO_inflation(init_portfolio_values):
166+
# _portfolio_cashflows_NO_inflation = deepcopy(init_portfolio_values)
167+
# _portfolio_cashflows_NO_inflation["cashflow"] = -100.0
168+
# _portfolio_cashflows_NO_inflation["initial_amount"] = 100_000.0
169+
# _portfolio_cashflows_NO_inflation["inflation"] = False
170+
# _portfolio_cashflows_NO_inflation["discount_rate"] = 0.09
171+
# return ok.Portfolio(**_portfolio_cashflows_NO_inflation)
172+
#
173+
#
174+
# @pytest.fixture(scope="package")
175+
# def portfolio_cashflows_NO_inflation_NO_discount_rate(init_portfolio_values):
176+
# _portfolio_cashflows_NO_inflation_NO_discount_rate = deepcopy(init_portfolio_values)
177+
# _portfolio_cashflows_NO_inflation_NO_discount_rate["cashflow"] = -100.0
178+
# _portfolio_cashflows_NO_inflation_NO_discount_rate["initial_amount"] = 100_000.0
179+
# _portfolio_cashflows_NO_inflation_NO_discount_rate["inflation"] = False
180+
# _portfolio_cashflows_NO_inflation_NO_discount_rate["discount_rate"] = None
181+
# return ok.Portfolio(**_portfolio_cashflows_NO_inflation_NO_discount_rate)
182+
#
183+
#
184+
# @pytest.fixture(scope="package")
185+
# def portfolio_cashflows_inflation_large_cf(init_portfolio_values):
186+
# _portfolio_cashflows_inflation_large_cf = deepcopy(init_portfolio_values)
187+
# _portfolio_cashflows_inflation_large_cf["cashflow"] = -2000
188+
# _portfolio_cashflows_inflation_large_cf["initial_amount"] = 100_000
189+
# return ok.Portfolio(**_portfolio_cashflows_inflation_large_cf)
193190

194191

195192
# Macro

tests/pytest.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ python_files = test_*
55
python_classes = Test*
66
python_functions = test_*
77
xfail_strict = true
8-
addopts = -n auto -p no:warnings
8+
addopts = -n auto
9+
filterwarnings =
10+
ignore::FutureWarning
11+
912

1013
markers =
1114
smoke: All critical smoke tests

tests/test_asset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_close_daily(init_asset_spy, init_asset_usdrub):
3434

3535
def test_close_monthly(init_asset_spy):
3636
# changed in 2022 MAY from 139.5625
37-
# changed in 2024 MAY from 139.625 to 139.5625
37+
# changed in 2024 OCT from 139.625 to 139.5625
3838
assert init_asset_spy.close_monthly.loc["2000-01"] == 139.5625
3939

4040

0 commit comments

Comments
 (0)