summaryrefslogtreecommitdiff
path: root/unotest
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-02-09 15:24:12 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-02-09 15:26:23 +0100
commit69aff995cb83cd702520999f592fe21a561042fa (patch)
tree06e3e047b59bf0c68e3bf2552466fd9d3970e0fe /unotest
parentf07a22ff6fb6c4bb131eacc9c3298b076361cee5 (diff)
Do not fail isStillAlive for "connect:" connections
Diffstat (limited to 'unotest')
-rw-r--r--unotest/source/cpp/officeconnection.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx
index 1b2e47c36b15..3791dddf8703 100644
--- a/unotest/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
@@ -180,7 +180,12 @@ OfficeConnection::getComponentContext() const {
}
bool OfficeConnection::isStillAlive() const {
- OSL_ASSERT(process_ != 0);
+ if (process_ == 0) {
+ // In case "soffice" argument starts with "connect:" we have no direct
+ // control over the liveness of the soffice.bin process (would need to
+ // directly monitor the bridge) so can only assume the best here:
+ return true;
+ }
TimeValue delay = { 0, 0 }; // 0 sec
oslProcessError e = osl_joinProcessWithTimeout(process_, &delay);
CPPUNIT_ASSERT(e == osl_Process_E_None || e == osl_Process_E_TimedOut);