[erp5.util] testnode: Don't json.loads() data that has already been parsed.

2d56e606 · Cédric de Saint Martin · 0159e6fc · 2d56e606
Commit 2d56e606 authored Apr 03, 2014 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

erp5/util/testnode/testnode.py erp5/util/testnode/testnode.py +6 -3

No files found.
--- a/erp5/util/testnode/testnode.py
+++ b/erp5/util/testnode/testnode.py
@@ -330,11 +330,14 @@ branch = %(branch)s
                                                        portal_url,
                                                        logger=DummyLogger(log))
          self.test_suite_portal.subscribeNode(node_title=config['test_node_title'],
-                                               computer_guid=config['computer_id'])                  
+                                               computer_guid=config['computer_id'])
-          test_suite_json = self.test_suite_portal.startTestSuite(
+          test_suite_data = self.test_suite_portal.startTestSuite(
                                               node_title=config['test_node_title'],
                                               computer_guid=config['computer_id'])
-          test_suite_data = Utils.deunicodeData(json.loads(test_suite_json))
+          if type(test_suite_data) == str:
+            # Backward compatiblity
+            test_suite_data = json.loads(test_suite_data)
+          test_suite_data = Utils.deunicodeData(test_suite_data)
          log("Got following test suite data from master : %r" % \
              (test_suite_data,))
          try: