Skip to content

Commit

Permalink
Merge pull request #661 from closeio/fix-imports-conftest
Browse files Browse the repository at this point in the history
Fix imports in conftest
  • Loading branch information
tsx authored Feb 5, 2024
2 parents b9f3c49 + b546e71 commit a2523cd
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@

from pytest import fixture

from inbox.util.testutils import dump_dns_queries # noqa
from inbox.util.testutils import files # noqa
from inbox.util.testutils import mock_dns_resolver # noqa
from inbox.util.testutils import mock_imapclient # noqa
from inbox.util.testutils import mock_smtp_get_connection # noqa
from inbox.util.testutils import uploaded_file_ids # noqa

from tests.api.base import TestAPIClient
from tests.util.base import * # noqa

# Additional fixtures
pytest_plugins = ["inbox.util.testutils", "tests.util.base"]


@fixture
Expand Down

0 comments on commit a2523cd

Please sign in to comment.