mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-26 16:04:06 +00:00
Code Issues Releases Wiki Activity

Fix test hanging reading FIFO when borg create failed

Browse source
This commit is contained in:
Peter Gerber 2023-02-01 20:23:17 +01:00
parent f25f6a8e33
commit 8ce3d22358
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/testsuite/archiver/create_cmd.py
View file

@ -784,6 +784,12 @@ def fifo_feeder(fifo_fn, data):
try: try:
self.cmd(f"--repo={self.repository_location}", "create", "--read-special", "test", "input/link_fifo") self.cmd(f"--repo={self.repository_location}", "create", "--read-special", "test", "input/link_fifo")
finally: finally:
# In case `borg create` failed to open FIFO, read all data to avoid join() hanging.
fd = os.open(fifo_fn, os.O_RDONLY | os.O_NONBLOCK)
try:
os.read(fd, len(data))
finally:
os.close(fd)
t.join() t.join()
with changedir("output"): with changedir("output"):
self.cmd(f"--repo={self.repository_location}", "extract", "test") self.cmd(f"--repo={self.repository_location}", "extract", "test")