summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-12-06 06:23:34 -0500
committerNed Batchelder <ned@nedbatchelder.com>2016-12-06 06:23:34 -0500
commit1526e4a074388dc228221ec3b8f0bbc1459eb383 (patch)
tree512a8799f1adf2865ac8a0c6118763253ca3ee9f
parent45ea51906343e7f046f8a5d235eb56152cffe417 (diff)
downloadpython-coveragepy-1526e4a074388dc228221ec3b8f0bbc1459eb383.tar.gz
Remove the filelock experiment
-rw-r--r--tests/test_process.py12
-rw-r--r--tox.ini1
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