diff options
| author | Loic Dachary <loic@dachary.org> | 2013-10-19 18:57:47 +0200 |
|---|---|---|
| committer | Loic Dachary <loic@dachary.org> | 2013-10-19 18:57:47 +0200 |
| commit | 94080de93a584bd5475b27055e8e0931a97ffbcb (patch) | |
| tree | 010352e7bd62f8593fe448f59bfa2c2630f23840 | |
| parent | 4d3502ba9b310cddcd8325da4b08adee26587143 (diff) | |
| download | ceph-94080de93a584bd5475b27055e8e0931a97ffbcb.tar.gz | |
common: get_command_descriptions use cout instead of dout
Using dout instead of cout creates noise and makes it more difficult for
people trying to debug a failure in test_ceph_argparse.py.
The output of get_command_descriptions is modified to only contain
parseable information and the code parsing its output
test_ceph_argparse.py is removed.
Signed-off-by: Loic Dachary <loic@dachary.org>
| -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") |