tests: fix gerrit query related unit tests

These tests were merged in a hurry and I think they never worked.

I fixed the tests and adjusted utils.tidy_ssh_user to match expected behavior
in an edge case.

Change-Id: I3011e0dc7b453db8d29be947b4b7c01201eec6fa

Author: Jakub Ruzicka

rdopkg/utils/__init__.py

@@ -7,11 +7,11 @@ def tidy_ssh_user(url=None, user=None):
         # is there a user already ?
         match = re.compile('ssh://([^@]+)@.+').match(url)
         if match:
-            ssh_user = match.groups()[0]
+            ssh_user = match.group(1)
             if user and ssh_user != user:
                 # assume prevalence of argument
-                url.replace(ssh_user + '@',
-                            user + '@')
+                url = url.replace(re.escape(ssh_user) + '@',
+                                  user + '@')
         elif user:
             url = 'ssh://' + \
                   user + '@' + \

tests/test_utils.py

@@ -3,26 +3,25 @@
 
 def test_url_tidying():
     # Do nothing when nothing is provided
-    assert(None, utils.tidy_ssh_user())
+    assert utils.tidy_ssh_user() is None
     # Do nothing when url is not provided
-    assert(None, utils.tidy_ssh_user(url=None, user='kyle'))
+    assert utils.tidy_ssh_user(url=None, user='kyle') is None
     # Do nothing when url doesn't start with ssh
     uri = 'http://mygitrepo/myproject.git'
-    assert(uri, utils.tidy_ssh_user(uri))
-    assert(uri, utils.tidy_ssh_user(uri, user='stan'))
+    assert utils.tidy_ssh_user(uri) == uri
+    assert utils.tidy_ssh_user(uri, user='stan') == uri
     # Do nothing if url starts with ssh, has no user, and no user provided
     uri = 'ssh://%smygitrepo/myproject.git'
-    assert(uri % '', utils.tidy_ssh_user(uri % ''))
+    assert utils.tidy_ssh_user(uri % '') == uri % ''
     # Add missing user if provided
-    assert(uri % 'kenny@', utils.tidy_ssh_user(uri % '', user='kenny'))
+    assert utils.tidy_ssh_user(uri % '', user='kenny') == uri % 'kenny@'
     # keep default user if no user provided
-    assert(uri % 'cartman@', utils.tidy_ssh_user(uri % 'cartman@'))
+    assert utils.tidy_ssh_user(uri % 'cartman@') == uri % 'cartman@'
     # change default user if user provided
-    assert(uri % 'butters@',
-           utils.tidy_ssh_user(uri % 'timmy@', user='butters'))
+    assert utils.tidy_ssh_user(uri % 'timmy@', user='dude') == uri % 'dude@'
 
 
-def test_GerritQuery(monkeypatch):
+def test_gerrit_query(monkeypatch):
     mock_result = """{"project":"ironic","branch":"liberty-patches","topic":"p1","id":"Ie0db0345c9d5f9ad3d2ec4880e084cd38d06a6dc","number":"368","subject":"Set default DB location","owner":{"name":"Fabien Boucher","email":"fabien.dot.boucher@gmail.com","username":"morucci"},"url":"http://rpmfactory.beta.rdoproject.org/r/368","commitMessage":"Set default DB location","createdOn":1453933391,"lastUpdated":1456332266,"open":true,"status":"NEW"}
 {"type":"stats","rowCount":1,"runTimeMilliseconds":4,"moreChanges":true}"""
 
@@ -31,9 +30,8 @@ def mock_run(*args, **kwargs):
     monkeypatch.setattr(utils.cmd, 'run', mock_run)
     g = utils.cmd.GerritQuery('gerrithost', '29418')
     r = g('project:ironic')
-    assert(True, isinstance(r, dict))
-    assert("Ie0db0345c9d5f9ad3d2ec4880e084cd38d06a6dc",
-           r['id'])
+    assert isinstance(r, dict) == True
+    assert r['id'] == "Ie0db0345c9d5f9ad3d2ec4880e084cd38d06a6dc"
     mock_result = """{"type":"stats","rowCount":0,"runTimeMilliseconds":4,"moreChanges":false}"""
     r = g('project:ironic')
-    assert(None, r)
+    assert r is None