From 1526e4a074388dc228221ec3b8f0bbc1459eb383 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 6 Dec 2016 06:23:34 -0500 Subject: Remove the filelock experiment --- tests/test_process.py | 12 ++++-------- tox.ini | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/test_process.py b/tests/test_process.py index 141b253..8ff9fbc 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -1092,22 +1092,18 @@ for pth_dir in possible_pth_dirs(): # pragma: part covered else: # pragma: not covered PTH_DIR = None -import filelock -if PTH_DIR: - pth_lock = filelock.FileLock(os.path.join(PTH_DIR, "pth.lock")) - class ProcessCoverageMixin(object): """Set up a .pth file to coverage-measure all sub-processes.""" def setUp(self): super(ProcessCoverageMixin, self).setUp() - pth_lock.acquire() - self.addCleanup(pth_lock.release) - # Find a place to put a .pth file. + # Create the .pth file. + self.assert_(PTH_DIR) pth_contents = "import coverage; coverage.process_startup()\n" - pth_path = os.path.join(pth_dir, "subcover.pth") + worker = os.environ.get('PYTEST_XDIST_WORKER', '') + pth_path = os.path.join(PTH_DIR, "subcover_{0}.pth".format(worker)) with open(pth_path, "w") as pth: pth.write(pth_contents) self.pth_path = pth_path diff --git a/tox.ini b/tox.ini index 19db60c..46bfc74 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,6 @@ deps = PyContracts==1.7.12 unittest-mixins==1.1.1 #-egit+/Users/ned/unittest_mixins#egg=unittest-mixins==0.0 - filelock py26: unittest2==1.1.0 py{27,33,34,35,36}: gevent==1.1.2 py{26,27,33,34,35,36}: eventlet==0.19.0 -- cgit v1.2.1