From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Mar 2020 16:52:32 +0000 (-0500)
Subject: ceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set
X-Git-Tag: v15.2.0~23^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a57e70028e6226a41ef295217160c038441cd70;p=ceph.git

ceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set

See https://tracker.ceph.com/issues/44582

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
index 033090ba13f2..8d22244d3264 100644
--- a/src/test/librados/misc.cc
+++ b/src/test/librados/misc.cc
@@ -318,7 +318,12 @@ static void shutdown_racer_func()
   int i;
 
   for (i = 0; i < niter; ++i) {
-    ASSERT_EQ("", connect_cluster(&rad));
+    auto r = connect_cluster(&rad);
+    if (getenv("ALLOW_TIMEOUTS")) {
+      ASSERT_TRUE(r == "" || r == "rados_connect failed with error -110");
+    } else {
+      ASSERT_EQ("", r);
+    }
     rados_shutdown(rad);
   }
 }