common/perf_counters: fix unit tests

The commands are now in json.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/test/perf_counters.cc b/src/test/perf_counters.cc
index d8f04ca7d10b5c0126bede7f0db2e060de4e9cc6..d0b05f9f0494585174efa20ee8e28d3473b33985 100644 (file)
--- a/src/test/perf_counters.cc
+++ b/src/test/perf_counters.cc
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
 TEST(PerfCounters, SimpleTest) {
   AdminSocketClient client(get_rand_socket_path());
   std::string message;
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &message));
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\" }", &message));
   ASSERT_EQ("{}", message);
 }
 
@@ -100,20 +100,20 @@ TEST(PerfCounters, SinglePerfCounters) {
   coll->add(fake_pf);
   AdminSocketClient client(get_rand_socket_path());
   std::string msg;
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &msg));
-  ASSERT_EQ(sd("{'test_perfcounter_1':{'element1':0,"
-           "'element2':0.000000000,'element3':{'avgcount':0,'sum':0.000000000}}}"), msg);
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\", \"format\": \"json\" }", &msg));
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":0,"
+           "\"element2\":0.000000000,\"element3\":{\"avgcount\":0,\"sum\":0.000000000}}}"), msg);
   fake_pf->inc(TEST_PERFCOUNTERS1_ELEMENT_1);
   fake_pf->tset(TEST_PERFCOUNTERS1_ELEMENT_2, utime_t(0, 500000000));
   fake_pf->tinc(TEST_PERFCOUNTERS1_ELEMENT_3, utime_t(100, 0));
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &msg));
-  ASSERT_EQ(sd("{'test_perfcounter_1':{'element1':1,"
-           "'element2':0.500000000,'element3':{'avgcount':1,'sum':100.000000000}}}"), msg);
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\", \"format\": \"json\" }", &msg));
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":1,"
+           "\"element2\":0.500000000,\"element3\":{\"avgcount\":1,\"sum\":100.000000000}}}"), msg);
   fake_pf->tinc(TEST_PERFCOUNTERS1_ELEMENT_3, utime_t());
   fake_pf->tinc(TEST_PERFCOUNTERS1_ELEMENT_3, utime_t(25,0));
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &msg));
-  ASSERT_EQ(sd("{'test_perfcounter_1':{'element1':1,'element2':0.500000000,"
-           "'element3':{'avgcount':3,'sum':125.000000000}}}"), msg);
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\", \"format\": \"json\" }", &msg));
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":1,\"element2\":0.500000000,"
+           "\"element3\":{\"avgcount\":3,\"sum\":125.000000000}}}"), msg);
 }
 
 enum {
@@ -142,24 +142,24 @@ TEST(PerfCounters, MultiplePerfCounters) {
   AdminSocketClient client(get_rand_socket_path());
   std::string msg;
 
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &msg));
-  ASSERT_EQ(sd("{'test_perfcounter_1':{'element1':0,'element2':0.000000000,'element3':"
-           "{'avgcount':0,'sum':0.000000000}},'test_perfcounter_2':{'foo':0,'bar':0.000000000}}"), msg);
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\", \"format\": \"json\" }", &msg));
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":0,\"element2\":0.000000000,\"element3\":"
+           "{\"avgcount\":0,\"sum\":0.000000000}},\"test_perfcounter_2\":{\"foo\":0,\"bar\":0.000000000}}"), msg);
 
   fake_pf1->inc(TEST_PERFCOUNTERS1_ELEMENT_1);
   fake_pf1->inc(TEST_PERFCOUNTERS1_ELEMENT_1, 5);
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &msg));
-  ASSERT_EQ(sd("{'test_perfcounter_1':{'element1':6,'element2':0.000000000,'element3':"
-           "{'avgcount':0,'sum':0.000000000}},'test_perfcounter_2':{'foo':0,'bar':0.000000000}}"), msg);
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\", \"format\": \"json\" }", &msg));
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":6,\"element2\":0.000000000,\"element3\":"
+           "{\"avgcount\":0,\"sum\":0.000000000}},\"test_perfcounter_2\":{\"foo\":0,\"bar\":0.000000000}}"), msg);
 
   coll->remove(fake_pf2);
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &msg));
-  ASSERT_EQ(sd("{'test_perfcounter_1':{'element1':6,'element2':0.000000000,"
-           "'element3':{'avgcount':0,'sum':0.000000000}}}"), msg);
-  ASSERT_EQ("", client.do_request("perfcounters_schema", &msg));
-  ASSERT_EQ(sd("{'test_perfcounter_1':{'element1':{'type':2},"
-              "'element2':{'type':1},'element3':{'type':5}}}"), msg);
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\", \"format\": \"json\" }", &msg));
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":6,\"element2\":0.000000000,"
+           "\"element3\":{\"avgcount\":0,\"sum\":0.000000000}}}"), msg);
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perf schema\", \"format\": \"json\" }", &msg));
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":{\"type\":2},"
+              "\"element2\":{\"type\":1},\"element3\":{\"type\":5}}}"), msg);
   coll->clear();
-  ASSERT_EQ("", client.do_request("perfcounters_dump", &msg));
+  ASSERT_EQ("", client.do_request("{ \"prefix\": \"perfcounters_dump\", \"format\": \"json\" }", &msg));
   ASSERT_EQ("{}", msg);
 }