mirror of https://github.com/borgbackup/borg.git
Merge pull request #7317 from pgerber/hanging-test
Fix test hanging reading FIFO when `borg create` failed
This commit is contained in:
commit
c96c5652b0
|
@ -766,6 +766,12 @@ class ArchiverTestCase(ArchiverTestCaseBase):
|
||||||
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")
|
||||||
|
|
Loading…
Reference in New Issue