From: Sage Weil <sage@inktank.com>
Date: Fri, 28 Jun 2013 13:54:18 +0000 (-0700)
Subject: librados: fix cmd OSDCommand test
X-Git-Tag: v0.66~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e857a4df64b87b4472a4c103449cd8496022502;p=ceph.git

librados: fix cmd OSDCommand test

If we get ENXIO, buflen will be 0.

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

diff --git a/src/test/librados/cmd.cc b/src/test/librados/cmd.cc
index bef0ab12dd67..71343f2b9087 100644
--- a/src/test/librados/cmd.cc
+++ b/src/test/librados/cmd.cc
@@ -77,8 +77,7 @@ TEST(LibRadosCmd, OSDCmd) {
   ASSERT_TRUE(r == -22 || r == -ENXIO);
   cmd[0] = (char *)"{\"prefix\":\"version\"}";
   r = rados_osd_command(cluster, 0, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen);
-  ASSERT_TRUE(r == 0 || r == -ENXIO);
-  ASSERT_LT(0u, buflen);
+  ASSERT_TRUE((r == 0 && buflen > 0) || (r == -ENXIO && buflen == 0));
   rados_buffer_free(buf);
   rados_buffer_free(st);