fix unit tests

Author: nleach999

cxone_api/util.py

@@ -11,11 +11,11 @@ def json_on_ok(response : Response, specific_responses : list = None):
 class CloneUrlParser:
 
     __parsers = {
-        "bitbucket" : re.compile("^(?P<scheme>.+)://((?P<cred>.+)@)?.+/(scm/)?(?P<org>.+)/(?P<repo>.+)(\\.git)?$"),
-        "azure" : re.compile("^(?P<scheme>.+)://((?P<cred>.+)@)?.+/(?P<org>.+)/(?P<project>.+)/_git/(?P<repo>.+)(\\.git)?$")
+        "bitbucket" : re.compile("^(?P<scheme>.+)://((?P<cred>.+)@)?.+/(scm/)?(?P<org>.+)/(?P<repo>.+?)(\\.git)?$"),
+        "azure" : re.compile("^(?P<scheme>.+)://((?P<cred>.+)@)?.+/(?P<org>.+)/(?P<project>.+)/_git/(?P<repo>.+?)(\\.git)?$")
     }
 
-    __default = re.compile("^.*[/:]{1}(?P<org>.+)/(?P<repo>.+)(\\.git)?$")
+    __default = re.compile("^.*[/:]{1}(?P<org>.+)/(?P<repo>.+?)(\\.git)?$")
 
     def __init__(self, repo_type, clone_url):
         matcher = CloneUrlParser.__parsers[repo_type] if repo_type in CloneUrlParser.__parsers.keys() else CloneUrlParser.__default

tests/cloneurl_parses_test.py

@@ -12,6 +12,13 @@ def test_http_with_port(self):
                         and parse.org == "the_org"
                         and parse.repo == "the_repo")
 
+    def test_http_with_port_no_git(self):
+        parse = CloneUrlParser("unknown", "http://the_host:7990/scm/the_org/the_repo")
+        self.assertTrue(parse.scheme is None 
+                        and parse.creds is None
+                        and parse.org == "the_org"
+                        and parse.repo == "the_repo")
+
 class TestCloneUrlBitBucket(unittest.TestCase):
 
     def test_canary(self):
@@ -24,6 +31,13 @@ def test_http_with_port(self):
                         and parse.org == "the_org"
                         and parse.repo == "the_repo")
 
+    def test_http_with_port_no_git(self):
+        parse = CloneUrlParser("bitbucket", "http://the_host:7990/scm/the_org/the_repo")
+        self.assertTrue(parse.scheme == "http" 
+                        and parse.creds is None
+                        and parse.org == "the_org"
+                        and parse.repo == "the_repo")
+
     def test_https_with_port(self):
         parse = CloneUrlParser("bitbucket", "https://the_host:7990/scm/the_org/the_repo.git")
         self.assertTrue(parse.scheme == "https" 
@@ -45,13 +59,6 @@ def test_https_url_rewirte(self):
                         and parse.org == "the_org"
                         and parse.repo == "the_repo")
 
-    def test_https_malformed(self):
-        parse = CloneUrlParser("bitbucket", "https://the_host/some/other/endpoint/scm/the_org/the_repo")
-        self.assertTrue(parse.scheme is None 
-                        and parse.creds is None
-                        and parse.org is None
-                        and parse.repo is None)
-
     def test_ssh_with_port(self):
         parse = CloneUrlParser("bitbucket", "ssh://the_user@the_host:7999/the_org/the_repo.git")
         self.assertTrue(parse.scheme == "ssh" 
@@ -72,6 +79,13 @@ def test_http_with_port(self):
                         and parse.org == "the_org"
                         and parse.repo == "the_repo")
 
+    def test_http_with_port_add_git(self):
+        parse = CloneUrlParser("azure", "http://the_server:8080/tfs/the_org/the_project/_git/the_repo.git")
+        self.assertTrue(parse.scheme == "http" 
+                        and parse.creds is None
+                        and parse.org == "the_org"
+                        and parse.repo == "the_repo")
+
     def test_https_with_port(self):
         parse = CloneUrlParser("azure", "https://someone@the_server:8080/tfs/the_org/the_project/_git/the_repo")
         self.assertTrue(parse.scheme == "https"