From: Loic Dachary <loic@dachary.org>
Date: Sat, 19 Oct 2013 16:57:47 +0000 (+0200)
Subject: common: get_command_descriptions use cout instead of dout
X-Git-Tag: v0.73~82^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F747%2Fhead;p=ceph.git

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>
---

diff --git a/src/test/common/get_command_descriptions.cc b/src/test/common/get_command_descriptions.cc
index aff5575b8c47..9f20102f705e 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 540f690472b0..fd680e854e80 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")