Skip to content

Commit f531212

Browse files
authored
fix: Avoid a race condition in misc.ensure_dir (#1220)
* coverage/misc.py (ensure_dir): Pass exist_ok to os.makedirs, ensuring that if two concurrent instances of coverage.py entering this function at the same time won't fail with FileExistsError. Sample backtrace: Traceback (most recent call last): File "/usr/lib/python3.8/runpy.py", line 194, in _run_module_as_main return _run_code(code, main_globals, None, File "/usr/lib/python3.8/runpy.py", line 87, in _run_code exec(code, run_globals) File "/home/user/.local/lib/python3.8/site-packages/coverage/__main__.py", line 8, in <module> sys.exit(main()) File "/home/user/.local/lib/python3.8/site-packages/coverage/cmdline.py", line 871, in main status = CoverageScript().command_line(argv) File "/home/user/.local/lib/python3.8/site-packages/coverage/cmdline.py", line 588, in command_line return self.do_run(options, args) File "/home/user/.local/lib/python3.8/site-packages/coverage/cmdline.py", line 743, in do_run self.coverage.start() File "/home/user/.local/lib/python3.8/site-packages/coverage/control.py", line 535, in start self._init_for_start() File "/home/user/.local/lib/python3.8/site-packages/coverage/control.py", line 474, in _init_for_start self._init_data(suffix) File "/home/user/.local/lib/python3.8/site-packages/coverage/control.py", line 512, in _init_data ensure_dir_for_file(self.config.data_file) File "/home/user/.local/lib/python3.8/site-packages/coverage/misc.py", line 165, in ensure_dir_for_file ensure_dir(os.path.dirname(path)) File "/.local/lib/python3.8/site-packages/coverage/misc.py", line 160, in ensure_dir os.makedirs(directory) File "/usr/lib/python3.8/os.py", line 223, in makedirs mkdir(name, mode)
1 parent c0a9811 commit f531212

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

coverage/misc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ def ensure_dir(directory):
156156
157157
If `directory` is None or empty, do nothing.
158158
"""
159-
if directory and not os.path.isdir(directory):
160-
os.makedirs(directory)
159+
if directory:
160+
os.makedirs(directory, exist_ok=True)
161161

162162

163163
def ensure_dir_for_file(path):

0 commit comments

Comments
 (0)