summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-06-28 06:54:18 -0700
committerSage Weil <sage@inktank.com>2013-06-28 06:54:18 -0700
commit2e857a4df64b87b4472a4c103449cd8496022502 (patch)
tree69184f828a004787baf48fe249d1d70cff3a55ab
parent9e604ee6943fdb131978afbec51321050faddfc6 (diff)
downloadceph-2e857a4df64b87b4472a4c103449cd8496022502.tar.gz
librados: fix cmd OSDCommand test
If we get ENXIO, buflen will be 0. Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/test/librados/cmd.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/librados/cmd.cc b/src/test/librados/cmd.cc
index bef0ab12dd6..71343f2b908 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);