summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBenjamin Schubert <contact@benschubert.me>2020-07-03 12:47:14 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-08-23 10:45:01 +0000
commit2d1fd2caf44f0f6a268d1369a9b4533300fc285d (patch)
treefe9b0a8190f21e5685ff12ceaf9f1d5ebc2dd763 /tests
parent0f1b547c9125a1bbf267136e48ba235e8814d5a2 (diff)
downloadbuildstream-2d1fd2caf44f0f6a268d1369a9b4533300fc285d.tar.gz
_fixtures.py: Only get the normal number of threads at the start of session
This ensures that we also have our tests correctly shutting down background threads and not interferring with each other
Diffstat (limited to 'tests')
-rwxr-xr-xtests/conftest.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 28e120d5e..476113105 100755
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -25,7 +25,11 @@ import pkg_resources
import pytest
from buildstream.testing import register_repo_kind, sourcetests_collection_hook
-from buildstream.testing._fixtures import reset_global_node_state, thread_check # pylint: disable=unused-import
+from buildstream.testing._fixtures import ( # pylint: disable=unused-import
+ default_thread_number,
+ reset_global_node_state,
+ thread_check,
+)
from buildstream.testing.integration import integration_cache # pylint: disable=unused-import