fix bug shown in integration test (#131)

* fix end string bug in admin_stats

* temporarily disable test that only fails in travis

* fix metric end string for other servers as well (TODO: refactor to move these to protocol module)

* re-enable integration

* minor fix

src/server/pingserver/admin/process.c

@@ -14,7 +14,7 @@
 #define METRIC_DESCRIBE_LEN 120 /* 34 (name) + 16 (type) + 68 (description) + CRLF */
 #define METRIC_FOOTER CRLF
 #define METRIC_END "END\r\n"
-#define METRIC_END_LEN sizeof(METRIC_END)
+#define METRIC_END_LEN (sizeof(METRIC_END) - 1)
 
 #define VERSION_PRINT_FMT "VERSION %s\r\n"
 #define VERSION_PRINT_LEN 30

src/server/slimcache/admin/process.c

@@ -14,7 +14,7 @@
 #define METRIC_DESCRIBE_LEN 120 /* 34 (name) + 16 (type) + 68 (description) + CRLF */
 #define METRIC_FOOTER CRLF
 #define METRIC_END "END\r\n"
-#define METRIC_END_LEN sizeof(METRIC_END)
+#define METRIC_END_LEN (sizeof(METRIC_END) - 1)
 
 #define VERSION_PRINT_FMT "VERSION %s\r\n"
 #define VERSION_PRINT_LEN 30

src/server/twemcache/admin/process.c

@@ -14,7 +14,7 @@
 #define METRIC_DESCRIBE_LEN 120 /* 34 (name) + 16 (type) + 68 (description) + CRLF */
 #define METRIC_FOOTER CRLF
 #define METRIC_END "END\r\n"
-#define METRIC_END_LEN sizeof(METRIC_END)
+#define METRIC_END_LEN (sizeof(METRIC_END) - 1)
 
 #define VERSION_PRINT_FMT "VERSION %s\r\n"
 #define VERSION_PRINT_LEN 30

test/integration/pelikan_client.py

@@ -26,10 +26,9 @@ def getStats(self):
                 else:
                     raise
         self.admin.setblocking(True)
-        # this NULL is kinda unexpected for me
-        if data[-6:] != 'END\r\n\0':
+        if data[-5:] != 'END\r\n':
             raise Exception('Invalid data while fetching stats: {}'.format(data))
-        return dict(line.split(' ')[1:] for line in data[:-6].strip().split('\r\n'))
+        return dict(line.split(' ')[1:] for line in data[:-5].strip().split('\r\n'))
 
     def read(self, length):
         return self.client.recv(length)