X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FHTTPRequest.py;h=9c64dbbf9bfb3e6d29fcd1a2c2e59d257c1c12d0;hb=07b85d35d2fcc378b0acff814c051fca7b78cb66;hp=5f87484fa298611135ac9ee1d2e87e9b0ef129ba;hpb=bd680a762d945b7970f7e62b7ee47776f0301f8c;p=csit.git

diff --git a/resources/libraries/python/HTTPRequest.py b/resources/libraries/python/HTTPRequest.py
index 5f87484fa2..9c64dbbf9b 100644
--- a/resources/libraries/python/HTTPRequest.py
+++ b/resources/libraries/python/HTTPRequest.py
@@ -27,8 +27,6 @@ from robot.libraries.BuiltIn import BuiltIn
 
 from requests import request, RequestException, Timeout, TooManyRedirects, \
     HTTPError, ConnectionError
-from requests.packages.urllib3 import disable_warnings
-from requests.packages.urllib3.exceptions import InsecureRequestWarning
 from requests.auth import HTTPBasicAuth
 
 
@@ -78,9 +76,6 @@ class HTTPRequestError(Exception):
             logger.error(self._msg)
             logger.debug(self._details)
 
-        # suppress warnings about disabled SSL verification
-        disable_warnings(InsecureRequestWarning)
-
     def __repr__(self):
         return repr(self._msg)
 
@@ -129,8 +124,8 @@ class HTTPRequest(object):
         except (AttributeError, AddressValueError):
             pass
 
-        return "https://{ip}:{port}{path}".format(ip=ip_addr, port=port,
-                                                  path=path)
+        return "http://{ip}:{port}{path}".format(ip=ip_addr, port=port,
+                                                 path=path)
 
     @staticmethod
     def _http_request(method, node, path, enable_logging=True, **kwargs):
@@ -233,7 +228,7 @@ class HTTPRequest(object):
 
     @staticmethod
     @keyword(name="HTTP Get")
-    def get(node, path, headers=None, timeout=10, enable_logging=True):
+    def get(node, path, headers=None, timeout=15, enable_logging=True):
         """Sends a GET request and returns the response and status code.
 
         :param node: Honeycomb node.
@@ -259,7 +254,7 @@ class HTTPRequest(object):
 
     @staticmethod
     @keyword(name="HTTP Put")
-    def put(node, path, headers=None, payload=None, json=None, timeout=10):
+    def put(node, path, headers=None, payload=None, json=None, timeout=15):
         """Sends a PUT request and returns the response and status code.
 
         :param node: Honeycomb node.
@@ -285,7 +280,7 @@ class HTTPRequest(object):
 
     @staticmethod
     @keyword(name="HTTP Post")
-    def post(node, path, headers=None, payload=None, json=None, timeout=10,
+    def post(node, path, headers=None, payload=None, json=None, timeout=15,
              enable_logging=True):
         """Sends a POST request and returns the response and status code.
 
@@ -317,7 +312,7 @@ class HTTPRequest(object):
 
     @staticmethod
     @keyword(name="HTTP Delete")
-    def delete(node, path, timeout=10):
+    def delete(node, path, timeout=15):
         """Sends a DELETE request and returns the response and status code.
 
         :param node: Honeycomb node.