Support urls without url scheme #31

Author: anaynayak

buildnotifylib/core/http_connection.py

@@ -3,6 +3,7 @@
 import socket
 import ssl
 import urllib2
+from urlparse import urlparse
 
 
 class HttpConnection(object):
@@ -17,6 +18,8 @@ def connect(self, server, timeout):
             unquoted_password = urllib2.unquote(server.password)
             encodedstring = base64.encodestring("%s:%s" % (unquoted_username, unquoted_password))[:-1]
             headers["Authorization"] = "Basic %s" % encodedstring
+        parsed = urlparse(server.url)
+        url = parsed.geturl() if parsed.scheme else 'http://' + server.url
         if server.skip_ssl_verification:
-            return urllib2.urlopen(urllib2.Request(server.url, None, headers), context=ssl._create_unverified_context())
-        return urllib2.urlopen(urllib2.Request(server.url, None, headers))
+            return urllib2.urlopen(urllib2.Request(url, None, headers), context=ssl._create_unverified_context())
+        return urllib2.urlopen(urllib2.Request(url, None, headers))

test/http_connection_test.py

@@ -7,17 +7,17 @@
 
 def test_should_fetch_data():
     file_path = os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "../../data/cctray.xml")
-    response = HttpConnection().connect(ServerConfig('file://' + file_path, [], '', '', None, None), 10)
+    response = HttpConnection().connect(ServerConfig('file://' + file_path, [], '', '', None, None), 3)
     assert str(response.read()) == open(file_path, 'r').read()
 
 
 def test_should_pass_auth_if_provided(mocker):
     m = mocker.patch.object(urllib2, 'urlopen', return_value='content')
-    response = HttpConnection().connect(ServerConfig('url', [], '', '', "user", "pass"), 10)
+    response = HttpConnection().connect(ServerConfig('url.com/cc.xml', [], '', '', "user", "pass"), 3)
     assert str(response) == 'content'
 
     def url_with_auth(a):
-        return a.get_full_url() == 'url' and a.get_header('Authorization') is not None
+        return a.get_full_url() == 'http://url.com/cc.xml' and a.get_header('Authorization') is not None
 
     m.assert_called_once_with(Matcher(url_with_auth))