|
@@ -86,22 +86,13 @@ class FrameworkTestType:
|
|
headers = {'Accept': self.accept_header}
|
|
headers = {'Accept': self.accept_header}
|
|
r = requests.get(url, timeout=15, headers=headers)
|
|
r = requests.get(url, timeout=15, headers=headers)
|
|
|
|
|
|
- try:
|
|
|
|
- r.raise_for_status() # Throws on non-200
|
|
|
|
- headers = r.headers
|
|
|
|
- body = r.content
|
|
|
|
- self.out.write(str(headers))
|
|
|
|
- self.out.write(body)
|
|
|
|
- b = 40
|
|
|
|
- print " Response (trimmed to %d bytes): \"%s\"" % (b, body.strip()[:b])
|
|
|
|
- return headers, body
|
|
|
|
- except requests.HTTPError as err:
|
|
|
|
- if isinstance(err.reason, basestring):
|
|
|
|
- self.err.write(err.reason + '\n')
|
|
|
|
- return None, None
|
|
|
|
- else:
|
|
|
|
- self.err.write("Request returned error code " + str(err.code) + '\n')
|
|
|
|
- return None, None
|
|
|
|
|
|
+ headers = r.headers
|
|
|
|
+ body = r.content
|
|
|
|
+ self.out.write(str(headers))
|
|
|
|
+ self.out.write(body)
|
|
|
|
+ b = 40
|
|
|
|
+ print " Response (trimmed to %d bytes): \"%s\"" % (b, body.strip()[:b])
|
|
|
|
+ return headers, body
|
|
|
|
|
|
def verify(self, base_url):
|
|
def verify(self, base_url):
|
|
'''
|
|
'''
|