In smoketest.cxx, also wait for connection_ going stale while waiting for result.condition.

1 files changed, 11 insertions, 3 deletions

diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx
index bb47b268d80b..f422ebc780c1 100644
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@ -56,6 +56,7 @@
 #include "cppunit/plugin/TestPlugIn.h"
 #include "osl/conditn.hxx"
 #include "osl/diagnose.h"
+#include "osl/time.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "test/gettestargument.hxx"
@@ -197,9 +198,16 @@ void Test::test() {
                 disp, url, css::uno::Sequence< css::beans::PropertyValue >(),
                 new Listener(&result)),
             css::uno::Any());
-    TimeValue t;
-    t.Seconds = 30; t.Nanosec = 0;
-    result.condition.wait(&t);
+    // Wait for result.condition or connection_ going stale:
+    for (;;) {
+        TimeValue delay = { 1, 0 }; // 1 sec
+        osl::Condition::Result res = result.condition.wait(&delay);
+        if (res == osl::Condition::result_ok) {
+            break;
+        }
+        CPPUNIT_ASSERT_EQUAL(osl::Condition::result_timeout, res);
+        CPPUNIT_ASSERT(connection_.isStillAlive());
+    }
     CPPUNIT_ASSERT(result.success);
     CPPUNIT_ASSERT_EQUAL(rtl::OUString(), result.result);
 }