Merge remote branch 'cros/upstream' into master

server/base_utils.py

 # Copyright 2008 Google Inc, Martin J. Bligh <mbligh@google.com>,
 #                Benjamin Poirier, Ryan Stutsman
 # Released under the GPL v2
 """
 Miscellaneous small functions.
 
 DO NOT import this file directly - it is mixed in by server/utils.py,
 import that instead
 """
 
@@ skipping 226 matching lines @@
         while len(key_machines) >= n:
             ntuples.append(key_machines[0:n])
             key_machines = key_machines[n:]
 
         for mach in key_machines:
             failures.append((mach, "machine can not be tupled"))
 
     return (ntuples, failures)
 
 
-def parse_machine(machine, user = 'root', port = 22, password = ''):
+def parse_machine(machine, user='root', password='', port=22):
     """
     Parse the machine string user:pass@host:port and return it separately,
     if the machine string is not complete, use the default parameters
     when appropriate.
     """
 
-    user = user
-    port = port
-    password = password
+    if '@' in machine:
+        user, machine = machine.split('@', 1)
 
-    if re.search('@', machine):
-        machine = machine.split('@')
+    if ':' in user:
+        user, password = user.split(':', 1)
 
-        if re.search(':', machine[0]):
-            machine[0] = machine[0].split(':')
-            user = machine[0][0]
-            password = machine[0][1]
+    if ':' in machine:
+        machine, port = machine.split(':', 1)
+        port = int(port)
 
-        else:
-            user = machine[0]
+    if not machine or not user:
+        raise ValueError
 
-        if re.search(':', machine[1]):
-            machine[1] = machine[1].split(':')
-            hostname = machine[1][0]
-            port = int(machine[1][1])
-
-        else:
-            hostname = machine[1]
-
-    elif re.search(':', machine):
-        machine = machine.split(':')
-        hostname = machine[0]
-        port = int(machine[1])
-
-    else:
-        hostname = machine
-
-    return hostname, user, password, port
+    return machine, user, password, port
 
 
 def get_public_key():
     """
     Return a valid string ssh public key for the user executing autoserv or
     autotest. If there's no DSA or RSA public key, create a DSA keypair with
     ssh-keygen and return it.
     """
 
     ssh_conf_path = os.path.expanduser('~/.ssh')
@@ skipping 123 matching lines @@
 
     # Client side barrier for all the tests to start at the same time
     control_new.append('b1 = job.barrier("%s", "c_bar", %d, port=%d)'
                     % (jobid, c_bar_timeout, c_bar_port))
     control_new.append("b1.rendezvous(%s)" % rendvstr)
 
     # Stick in the rest of the control file
     control_new.append(control)
 
     return "\n".join(control_new)