diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-04 10:05:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-04 12:44:27 +0200 |
| commit | 67a2317be8a46b3254475c689e8eca5e9acd45ab (patch) | |
| tree | a563c2efce4bd54b47b3a0af094fa854bf071e10 /uitest | |
| parent | 59e5d2c8839ee6bf2bb237c0db4a618cb98b2dd9 (diff) | |
Revert "uitest: make child soffice process die when parent dies"
This reverts commit d35840a2111beafe018851314a624e268e3cde6a, now that
43aef04d77aafb9d055957642e62b559231f3711 "Reliably wait for soffice to
terminate" makes sure that no soffice-related processes are left behind by
UITests. Using PR_SET_PDEATHSIG had the following drawbacks:
* It defeats debugging if a runaway process is forcefully killed by the test
framework. (And there are already higher-layer mechanisms in place for the
reliable termination of runaway tinderbox builds, see the commit message of
43aef04d77aafb9d055957642e62b559231f3711 mentioned above.)
* It is brittle in that it can terminate soffice-related processes too early, as
the signal is sent as soon as the parent's thread that spawned the child (and
not the parent process as a whole) terminates.
* It is Linux-only.
Change-Id: Ia07f5dbaafc824bad0dfbdb1a2aabe6d5508741b
Reviewed-on: https://gerrit.libreoffice.org/80186
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/libreoffice/connection.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py index 12917555a2fe..cb3ae1a0128e 100644 --- a/uitest/libreoffice/connection.py +++ b/uitest/libreoffice/connection.py @@ -66,7 +66,7 @@ class OfficeConnection: argv = [soffice, "--accept=" + socket + ";urp", "-env:UserInstallation=" + userdir, "--quickstart=no", "--nofirststartwizard", - "--norestore", "--nologo", "--dont-survive-parent"] + "--norestore", "--nologo"] if "--valgrind" in self.args: argv.append("--valgrind") |