Make JSON Call Instead

StorjOld · Aug 13, 2015 · 1228517 · 1228517
1 parent f6fbacf
commit 1228517
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/dataserv/app.py b/dataserv/app.py
@@ -4,7 +4,7 @@
 import sys
 import os.path
 import datetime
-from flask import make_response
+from flask import make_response, jsonify
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
 # Import modules
@@ -107,8 +107,9 @@ def total():
     # return in TB the number
     app.config["BYTE_SIZE"] = 1024*1024*128
     result = total_shards * (app.config["BYTE_SIZE"] / (1024*1024*1024*1024))  # bytes / 1 TB
+    json_data = {'total_TB': round(result, 2)}
 
-    return "{0} TB".format(round(result, 2))
+    return jsonify(json_data)
 
 
 @app.route('/api/height/<btc_addr>/<int:height>', methods=["GET"])

diff --git a/tests/test_App.py b/tests/test_App.py
@@ -154,4 +154,6 @@ def test_farmer_total_bytes(self):
 
         # check total bytes
         rv = self.app.get('/api/total')
-        self.assertEqual(b"1.22 TB", rv.data)
+        json_data =  b'{\n  "total_TB": 1.22\n}'
+
+        self.assertEqual(json_data, rv.data)