Fix test warnings by jdebacker · Pull Request #1061 · PSLmodels/OG-Core

jdebacker · 2025-09-28T19:26:06Z

This PR seeks to address Issue #1047 and reduce the number of pytest warnings.

codecov-commenter · 2025-09-28T19:57:54Z

Codecov Report

❌ Patch coverage is 28.12500% with 69 lines in your changes missing coverage. Please review.
✅ Project coverage is 72.92%. Comparing base (9aafbbd) to head (7e88e4f).
⚠️ Report is 170 commits behind head on master.

Files with missing lines	Patch %	Lines
ogcore/SS.py	28.00%	54 Missing ⚠️
ogcore/TPI.py	0.00%	15 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1061      +/-   ##
==========================================
+ Coverage   72.43%   72.92%   +0.49%     
==========================================
  Files          21       21              
  Lines        5100     5090      -10     
==========================================
+ Hits         3694     3712      +18     
+ Misses       1406     1378      -28

Flag	Coverage Δ
unittests	`72.92% <28.12%> (+0.49%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
ogcore/__init__.py	`100.00% <100.00%> (ø)`
ogcore/constants.py	`100.00% <100.00%> (ø)`
ogcore/parameter_plots.py	`78.26% <100.00%> (-0.09%)`	⬇️
ogcore/parameter_tables.py	`86.07% <100.00%> (ø)`
ogcore/TPI.py	`34.41% <0.00%> (-1.16%)`	⬇️
ogcore/SS.py	`79.63% <28.00%> (+8.11%)`	⬆️

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

- Add timeout (600s) and error handling to TPI.py client.gather() with fallback to serial computation - Increase SS.py client.gather() timeout from 300s to 600s for consistency - Update SS.py to use logging.warning instead of print for better consistency - Adjust LocalCluster timeouts in test_TPI.py fixture: - Increase memory_limit from 2GB to 3GB - Increase communication timeout from 300s to 900s - Increase heartbeat_interval from 10s to 30s - Increase death_timeout from 60s to 120s These changes address issues with long-running computationally intensive tasks where communication can break down due to overly aggressive timeouts. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>

The previous commit incorrectly used client.gather(timeout=) which is not a valid parameter. This commit fixes the implementation to use the correct approach: - Use distributed.wait() with timeout to wait for futures to complete - Check if any futures did not complete (not_done) and raise TimeoutError - Only call client.gather() after confirming all futures are done - Maintain the same error handling and fallback to serial computation This properly implements timeout handling for long-running dask computations in both TPI.py and SS.py. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>

rickecon · 2025-10-06T06:00:48Z

@jdebacker. I have reviewed the code of this PR and approved it. Is it ready to merge?

jdebacker · 2025-10-06T12:13:31Z

@rickecon Changing to WIP -- still resolving some local tests (dask timing out in some TPI full runs) and looking to improve performance.

rickecon · 2025-11-07T23:53:18Z

@jdebacker. I came back to this PR to try to get it merged in. I have gone through all the code. I just want to test it on my local machine, but I noticed that it is two commits behind the master branch. If you would update this branch, I would love to get it tested and merged in.

jdebacker · 2025-11-24T20:52:59Z

All local tests seem to pass (though still waiting on the 2nd of the 4 tests in test_basic.py to finish -- been going 4+ hours):

tests/test_SS.py ......................................                  [  6%]
tests/test_TPI.py ...........................                            [ 10%]
tests/test_aggregates.py .........................................       [ 17%]
tests/test_basic.py .

+

(ogcore-dev) jason.debacker@MacBookPro OG-Core % pytest tests/test_basic.py::test_constant_demographics_TPI
============================= test session starts ==============================
platform darwin -- Python 3.13.9, pytest-9.0.0, pluggy-1.6.0
rootdir: /Users/jason.debacker/repos/OG-Core
configfile: pytest.ini
plugins: anyio-4.11.0, xdist-3.8.0, cov-7.0.0
collected 1 item

tests/test_basic.py .                                                    [100%]

=============================== warnings summary ===============================
tests/test_basic.py::test_constant_demographics_TPI
  /Users/jason.debacker/anaconda3/envs/ogcore-dev/lib/python3.13/site-packages/distributed/node.py:188: UserWarning: Port 8787 is already in use.
  Perhaps you already have a cluster running?
  Hosting the HTTP server on port 59730 instead
    warnings.warn(

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=================== 1 passed, 1 warning in 169.79s (0:02:49) ===================
(ogcore-dev) jason.debacker@MacBookPro OG-Core % pytest tests/test_basic.py::test_constant_demographics_TPI_small_open
============================= test session starts ==============================
platform darwin -- Python 3.13.9, pytest-9.0.0, pluggy-1.6.0
rootdir: /Users/jason.debacker/repos/OG-Core
configfile: pytest.ini
plugins: anyio-4.11.0, xdist-3.8.0, cov-7.0.0
collected 1 item

tests/test_basic.py .                                                    [100%]

=============================== warnings summary ===============================
tests/test_basic.py::test_constant_demographics_TPI_small_open
  /Users/jason.debacker/anaconda3/envs/ogcore-dev/lib/python3.13/site-packages/distributed/node.py:188: UserWarning: Port 8787 is already in use.
  Perhaps you already have a cluster running?
  Hosting the HTTP server on port 59936 instead
    warnings.warn(

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=================== 1 passed, 1 warning in 180.41s (0:03:00) ===================

tests/test_aggregates.py .........................................       [100%]
tests/test_demographics.py ................                              [100%]
tests/test_elliptical_u_est.py .......                                   [100%]
tests/test_execute.py .                                                  [100%]
tests/test_firm.py ..................................................... [ 76%]
................                                                         [100%]
tests/test_fiscal.py ......................                              [100%]
tests/test_household.py ................................................ [ 96%]
..                                                                       [100%]
tests/test_output_plots.py ............................................. [ 95%]
..                                                                       [100%]
tests/test_output_tables.py ..............                               [100%]
tests/test_parameter_plots.py ........................................   [100%]
tests/test_parameter_tables.py .......                                   [100%]
tests/test_parameters.py ..............                                  [100%]
tests/test_pensions.py ...............................                   [100%]
tests/test_run_example.py ..                                             [100%]
tests/test_run_ogcore.py .                                               [100%]
tests/test_tax.py ...................................                    [100%]
tests/test_txfunc.py ..............................                      [100%]
tests/test_user_inputs.py .........                                      [100%]
tests/test_utils.py .................................................... [ 62%]
...............................                                          [100%]

rickecon · 2025-11-24T21:47:38Z

@jdebacker. Looks great. Merging now.

jdebacker added 3 commits September 28, 2025 15:24

ignore invalid value warnings in pyest

93d8e48

extract item to avoid numpy deprecation warning

eda7693

proper handle array to scalar conversion

408f894

jdebacker added 6 commits September 28, 2025 23:28

change how tighten image

f46333c

avoid divide by zero

773de05

update from deprecated cm map

0c428ee

avoid power warnings

af78abb

fix negation

2f1569c

Merge remote-tracking branch 'upstream/master' into fix_test_warnings

b493779

jdebacker marked this pull request as ready for review October 3, 2025 02:24

jdebacker and others added 2 commits October 3, 2025 10:01

rickecon approved these changes Oct 6, 2025

View reviewed changes

jdebacker changed the title ~~Fix test warnings~~ [WIP] Fix test warnings Oct 6, 2025

jdebacker added 12 commits October 6, 2025 08:50

use consistent superscript

73f3725

remove duplicate code from SS.run_SS

8eff47b

format

5ac2f71

remove more redundant lines in run_SS

7c68081

make function for initial guesses

b53c322

move dev factors to constants

411af2e

add docstring

19baba7

change starting value for r

030cd57

add line at end

95152bb

add test of new function

5bb3479

add test of solve_for_j function

66b6fd7

remove print commands used to debug

4d3b8b0

jdebacker changed the title ~~[WIP] Fix test warnings~~ Fix test warnings Oct 24, 2025

update paths

60fc3ef

jdebacker added 2 commits November 8, 2025 00:18

Merge remote-tracking branch 'upstream/master' into fix_test_warnings

b8ed1d0

sync upstream

b40d179

bump version and update changelog

7e88e4f

rickecon approved these changes Nov 24, 2025

View reviewed changes

rickecon merged commit cb0e9df into PSLmodels:master Nov 24, 2025
8 checks passed

jdebacker mentioned this pull request Mar 26, 2026

Lots of warnings when running pytest #1047

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Fix test warnings#1061

Fix test warnings#1061
rickecon merged 27 commits into
PSLmodels:masterfrom
jdebacker:fix_test_warnings

jdebacker commented Sep 28, 2025

Uh oh!

codecov-commenter commented Sep 28, 2025 •

edited

Loading

Uh oh!

rickecon commented Oct 6, 2025

Uh oh!

jdebacker commented Oct 6, 2025

Uh oh!

rickecon commented Nov 7, 2025

Uh oh!

jdebacker commented Nov 24, 2025

Uh oh!

rickecon commented Nov 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

jdebacker commented Sep 28, 2025

Uh oh!

codecov-commenter commented Sep 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

rickecon commented Oct 6, 2025

Uh oh!

jdebacker commented Oct 6, 2025

Uh oh!

rickecon commented Nov 7, 2025

Uh oh!

jdebacker commented Nov 24, 2025

Uh oh!

rickecon commented Nov 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov-commenter commented Sep 28, 2025 •

edited

Loading