test-bugzilla-files/test-bugzilla-files.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 7646673d496c3a4efc71dcebbfb00f8ff3494944
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 19 20:02:21 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 19 21:07:07 2022 +0200
remove the OSL_PIPE_$uid_pytest_foo on killing process
we pass this name to soffice ourself, so we know what the final name
of the pipe will be, so we can remove it ourself
Change-Id: I8d98f8464a203278da09b20be5c7d76f85a6d437
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/140205
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/test-bugzilla-files/test-bugzilla-files.py
b/test-bugzilla-files/test-bugzilla-files.py
index ec3d492..50a7508 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -83,6 +83,7 @@ class OfficeConnection:
self.args = args
self.soffice = None
self.socket = None
+ self.pipename = None
self.xContext = None
self.pro = None
self.suicided = False
@@ -91,7 +92,8 @@ class OfficeConnection:
if sep != ":":
raise Exception("soffice parameter does not specify method")
if method == "path":
- socket = "pipe,name=pytest" + str(uuid.uuid1())
+ self.pipename = "pytest" + str(uuid.uuid1())
+ socket = "pipe,name=" + self.pipename
try:
userdir = self.args["--userdir"]
except KeyError:
@@ -159,6 +161,9 @@ class OfficeConnection:
# return ret
def kill(self):
self.suicided = True
+ command = "rm /tmp/OSL_PIPE_" + str(os.getuid()) + "_" + self.pipename;
+ print(command)
+ os.system(command)
command = "kill " + str(self.pro.pid)
killFile = open("killFile.log", "a")
killFile.write(command + "\n")
