X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/62d8f575a93374a235097b88499fa65eef2f56ec..aa541480ba27f2dfec85cbe4f07c07743bb901b2:/services/fuse/tests/mount_test_base.py diff --git a/services/fuse/tests/mount_test_base.py b/services/fuse/tests/mount_test_base.py index 1319aebdcc..d476fc771b 100644 --- a/services/fuse/tests/mount_test_base.py +++ b/services/fuse/tests/mount_test_base.py @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + import arvados import arvados_fuse as fuse import arvados.safeapi @@ -17,6 +21,8 @@ import unittest logger = logging.getLogger('arvados.arv-mount') +from .integration_test import workerPool + class MountTestBase(unittest.TestCase): def setUp(self, api=None, local_store=True): # The underlying C implementation of open() makes a fstat() syscall @@ -26,8 +32,8 @@ class MountTestBase(unittest.TestCase): # deadlocks. The workaround is to run some of our test code in a # separate process. Forturnately the multiprocessing module makes this # relatively easy. - self.pool = multiprocessing.Pool(1) + self.pool = workerPool() if local_store: self.keeptmp = tempfile.mkdtemp() os.environ['KEEP_LOCAL_STORE'] = self.keeptmp @@ -85,8 +91,6 @@ class MountTestBase(unittest.TestCase): shutil.rmtree(self.keeptmp) os.environ.pop('KEEP_LOCAL_STORE') run_test_server.reset() - self.pool.close() - self.pool.join() def assertDirContents(self, subdir, expect_content): path = self.mounttmp