mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7317 from pgerber/hanging-test 

Fix test hanging reading FIFO when `borg create` failed
This commit is contained in:
TW 2023-02-03 01:59:15 +01:00 committed by GitHub
parent 9b7647c89d 8ce3d22358
commit c96c5652b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -766,6 +766,12 @@ class ArchiverTestCase(ArchiverTestCaseBase):
try:
self.cmd(f"--repo={self.repository_location}", "create", "--read-special", "test", "input/link_fifo")
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()
with changedir("output"):
self.cmd(f"--repo={self.repository_location}", "extract", "test")