|
@@ -237,7 +237,6 @@ class FrameworkTest:
|
|
""".format( trace=sys.exc_info()[:2])))
|
|
""".format( trace=sys.exc_info()[:2])))
|
|
return False
|
|
return False
|
|
|
|
|
|
-
|
|
|
|
############################################################
|
|
############################################################
|
|
# Validates the jsonString is an array with a length of
|
|
# Validates the jsonString is an array with a length of
|
|
# 500, that each entry in the array is a JSON object, that
|
|
# 500, that each entry in the array is a JSON object, that
|
|
@@ -421,14 +420,17 @@ class FrameworkTest:
|
|
output = self.__curl_url(url, self.QUERY, out, err)
|
|
output = self.__curl_url(url, self.QUERY, out, err)
|
|
url2 = self.benchmarker.generate_url(self.query_url + "0", self.port)
|
|
url2 = self.benchmarker.generate_url(self.query_url + "0", self.port)
|
|
output2 = self.__curl_url(url2, self.QUERY, out, err)
|
|
output2 = self.__curl_url(url2, self.QUERY, out, err)
|
|
- url3 = self.benchmarker.generate_url(self.query_url + "501", self.port)
|
|
|
|
|
|
+ url3 = self.benchmarker.generate_url(self.query_url + "foo", self.port)
|
|
output3 = self.__curl_url(url3, self.QUERY, out, err)
|
|
output3 = self.__curl_url(url3, self.QUERY, out, err)
|
|
|
|
+ url4 = self.benchmarker.generate_url(self.query_url + "501", self.port)
|
|
|
|
+ output4 = self.__curl_url(url4, self.QUERY, out, err)
|
|
if self.validateQuery(output, out, err):
|
|
if self.validateQuery(output, out, err):
|
|
self.query_url_passed = True
|
|
self.query_url_passed = True
|
|
else:
|
|
else:
|
|
self.query_url_passed = False
|
|
self.query_url_passed = False
|
|
if (not self.validateQueryOneOrLess(output2, out, err) or
|
|
if (not self.validateQueryOneOrLess(output2, out, err) or
|
|
- not self.validateQueryFiveHundredOrMore(output3, out, err)):
|
|
|
|
|
|
+ not self.validateQueryOneOrLess(output3, out, err) or
|
|
|
|
+ not self.validateQueryFiveHundredOrMore(output4, out, err)):
|
|
self.query_url_warn = True
|
|
self.query_url_warn = True
|
|
else:
|
|
else:
|
|
self.query_url_warn = False
|
|
self.query_url_warn = False
|