Skip to content

Commit

Permalink
fix: move new pytest config to tox.ini with existing config
Browse files Browse the repository at this point in the history
This avoids pytest.ini taking priority when tests are run and the
tox.ini config not being read.
  • Loading branch information
james-garner-canonical committed Oct 16, 2024
1 parent a12dc19 commit 4e45bc9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 0 additions & 3 deletions pytest.ini

This file was deleted.

1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ markers =
wait_for_idle: mark a test that waits for the model to be idle
bundle: mark a test that uses a bundle
asyncio_mode = auto
asyncio_default_fixture_loop_scope = function
filterwarnings =
ignore::DeprecationWarning:websockets

Expand Down

0 comments on commit 4e45bc9

Please sign in to comment.