diff options
| author | Sage Weil <sage@inktank.com> | 2013-10-19 21:12:38 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-10-19 21:12:38 -0700 |
| commit | 1f02d006b7de828299b1e4e9ad530d88a3b9781c (patch) | |
| tree | 008d1e9867778a5fb87c657bbe5ea579856b65af | |
| parent | d9d390caf6bf2a19c088f1804a465324519eb8a6 (diff) | |
| parent | 94080de93a584bd5475b27055e8e0931a97ffbcb (diff) | |
| download | ceph-1f02d006b7de828299b1e4e9ad530d88a3b9781c.tar.gz | |
Merge pull request #747 from dachary/wip-commands
common: get_command_descriptions use cout instead of dout
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/test/common/get_command_descriptions.cc | 5 | ||||
| -rwxr-xr-x | src/test/pybind/test_ceph_argparse.py | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/test/common/get_command_descriptions.cc b/src/test/common/get_command_descriptions.cc index aff5575b8c4..9f20102f705 100644 --- a/src/test/common/get_command_descriptions.cc +++ b/src/test/common/get_command_descriptions.cc @@ -24,9 +24,6 @@ #include "mon/Monitor.h" #include "common/ceph_argparse.h" #include "global/global_init.h" -#include "common/debug.h" - -#define dout_subsys ceph_subsys_mon static void usage(ostream &out) { @@ -51,7 +48,7 @@ static void json_print(const MonCommand *mon_commands, int size) get_command_descriptions(mon_commands, size, f, &rdata); delete f; string data(rdata.c_str(), rdata.length()); - dout(0) << data << dendl; + cout << data << std::endl; } static void all() diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index 540f690472b..fd680e854e8 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -24,9 +24,7 @@ import re import json def get_command_descriptions(what): - buffer = os.popen("./get_command_descriptions " + "--" + what - + " 2>&1 | grep cmd000").read() - return re.sub(r'^.*?(\{.*\})', '\g<1>', buffer) + return os.popen("./get_command_descriptions " + "--" + what).read() def test_parse_json_funcsigs(): commands = get_command_descriptions("all") |