Merge pull request #11702 from wjwithagen/wip-wjw-freebsd-cephtool-test

qa/workunits/cephtool/test.sh: FreeBSD has no distro.

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-11-10 10:18:23 +08:00 committed by GitHub
commit 37f3897c55

View File

@ -1137,8 +1137,10 @@ function test_mon_osd()
expect_false ceph osd find xyz
expect_false ceph osd find 0.1
ceph --format plain osd find 1 # falls back to json-pretty
ceph osd metadata 1 | grep 'distro'
ceph --format plain osd metadata 1 | grep 'distro' # falls back to json-pretty
if [ `uname` == Linux ]; then
ceph osd metadata 1 | grep 'distro'
ceph --format plain osd metadata 1 | grep 'distro' # falls back to json-pretty
fi
ceph osd out 0
ceph osd dump | grep 'osd.0.*out'
ceph osd in 0