소스 검색

Log raw data when validation failure happens

Hamilton Turner 11 년 전
부모
커밋
bba305384a
1개의 변경된 파일19개의 추가작업 그리고 1개의 파일을 삭제
  1. 19 1
      toolset/benchmark/framework_test.py

+ 19 - 1
toolset/benchmark/framework_test.py

@@ -136,13 +136,15 @@ class FrameworkTest:
   # Validates the jsonString is a JSON object with a 'message'
   # Validates the jsonString is a JSON object with a 'message'
   # key with the value "hello, world!" (case-insensitive).
   # key with the value "hello, world!" (case-insensitive).
   ############################################################
   ############################################################
-  def validateJson(self, jsonString, out, err):
+  def validateJson(self, jsonString, logger=log):
     try:
     try:
       obj = {k.lower(): v for k,v in json.loads(jsonString).items()}
       obj = {k.lower(): v for k,v in json.loads(jsonString).items()}
 
 
       if  obj["message"].lower() == "hello, world!":
       if  obj["message"].lower() == "hello, world!":
         return True
         return True
     except:
     except:
+      logger.debug("Expected: %s", "{'message':'hello, world!'}")
+      logger.debug("Got: '%s'", jsonString)
       pass
       pass
     return False
     return False
 
 
@@ -167,6 +169,8 @@ class FrameworkTest:
           type(float(obj["randomnumber"])) == float):
           type(float(obj["randomnumber"])) == float):
         return True
         return True
     except:
     except:
+      # logger.debug("Expected: %s", "")
+      logger.debug("Got: %s", jsonString)
       pass
       pass
     return False
     return False
 
 
@@ -181,6 +185,8 @@ class FrameworkTest:
           type(float(obj["randomnumber"])) == float):
           type(float(obj["randomnumber"])) == float):
         return True
         return True
     except:
     except:
+      # logger.debug("Expected: %s", "")
+      logger.debug("Got: %s", jsonString)
       pass
       pass
     return False
     return False
 
 
@@ -201,6 +207,8 @@ class FrameworkTest:
           type(float(arr[1]["randomnumber"])) == float):
           type(float(arr[1]["randomnumber"])) == float):
         return True
         return True
     except:
     except:
+      # logger.debug("Expected: %s", "")
+      logger.debug("Got: %s", jsonString)
       pass
       pass
     return False
     return False
 
 
@@ -226,6 +234,8 @@ class FrameworkTest:
       # By here, it's passed validation
       # By here, it's passed validation
       return True
       return True
     except:
     except:
+      # logger.debug("Expected: %s", "")
+      logger.debug("Got: %s", jsonString)
       pass
       pass
     return False
     return False
 
 
@@ -251,6 +261,8 @@ class FrameworkTest:
       # By here, it's passed validation
       # By here, it's passed validation
       return True
       return True
     except:
     except:
+      # logger.debug("Expected: %s", "")
+      logger.debug("Got: %s", jsonString)
       pass
       pass
     return False
     return False
 
 
@@ -265,6 +277,8 @@ class FrameworkTest:
 
 
       return parser.isValidFortune()
       return parser.isValidFortune()
     except:
     except:
+      # logger.debug("Expected: %s", "")
+      logger.debug("Got: %s", htmlString)
       pass
       pass
     return False
     return False
 
 
@@ -284,6 +298,8 @@ class FrameworkTest:
           type(float(arr[1]["randomnumber"])) == float):
           type(float(arr[1]["randomnumber"])) == float):
         return True
         return True
     except:
     except:
+      # logger.debug("Expected: %s", "")
+      logger.debug("Got: %s", jsonString)
       pass
       pass
     return False
     return False
 
 
@@ -294,6 +310,8 @@ class FrameworkTest:
     try:
     try:
       return jsonString.lower().strip() == "hello, world!"
       return jsonString.lower().strip() == "hello, world!"
     except:
     except:
+      logger.debug("Expected: %s", "hello, world!")
+      logger.debug("Got: %s", jsonString)
       pass
       pass
     return False
     return False