From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 31 Jul 2015 09:18:58 +0000 (+0800)
Subject: test/admin_socket: check error message according to OS
X-Git-Tag: v9.1.0~259^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b06838a09db6bfc6ced4cbb124084a064afdc564;p=ceph.git

test/admin_socket: check error message according to OS

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/test/admin_socket.cc b/src/test/admin_socket.cc
index b26acb8908d5..cee215d2e96f 100644
--- a/src/test/admin_socket.cc
+++ b/src/test/admin_socket.cc
@@ -217,7 +217,12 @@ TEST(AdminSocketClient, Ping) {
   {
     bool ok;
     std::string result = client.ping(&ok);
-    EXPECT_NE(std::string::npos, result.find("Connection refused"));
+#if defined(__APPLE__) || defined(__FreeBSD__)
+    const char* errmsg = "Socket operation on non-socket";
+#else
+    const char* errmsg = "Connection refused";
+#endif
+    EXPECT_NE(std::string::npos, result.find(errmsg));
     ASSERT_FALSE(ok);
   }
   // a daemon is connected to the socket