Merge remote branch 'cros/upstream' into tempbranch

client/common_lib/base_packages.py

 """
 This module defines the BasePackageManager Class which provides an
 implementation of the packaging system API providing methods to fetch,
 upload and remove packages. Site specific extensions to any of these methods
 should inherit this class.
 """
 
 import re, os, sys, traceback, subprocess, shutil, time, traceback, urlparse
 import fcntl, logging
 from autotest_lib.client.common_lib import error, utils, global_config
@@ skipping 101 matching lines @@
 
     def _quick_http_test(self):
         """ Run a simple 30 second wget on the repository to see if it is
         reachable. This avoids the need to wait for a full 10min timeout.
         """
         # just make a temp file to write a test fetch into
         mktemp = 'mktemp -u /tmp/tmp.XXXXXX'
         dest_file_path = self.run_command(mktemp).stdout.strip()
 
         try:
-            # build up a wget command using the server name
-            server_name = urlparse.urlparse(self.url)[1]
-            http_cmd = self.wget_cmd_pattern % (server_name, dest_file_path)
+            # build up a wget command
+            http_cmd = self.wget_cmd_pattern % (self.url, dest_file_path)
             try:
                 self.run_command(http_cmd, _run_command_dargs={'timeout': 30})
             except Exception, e:
                 msg = 'HTTP test failed, unable to contact %s: %s'
-                raise error.PackageFetchError(msg % (server_name, e))
+                raise error.PackageFetchError(msg % (self.url, e))
         finally:
             self.run_command('rm -rf %s' % dest_file_path)
 
 
     def fetch_pkg_file(self, filename, dest_path):
         logging.info('Fetching %s from %s to %s', filename, self.url,
                      dest_path)
 
         # do a quick test to verify the repo is reachable
         self._quick_http_test()
@@ skipping 713 matching lines @@
         if not match:
             return ('', url)
         group, filename = match.groups()
         # Generate the group prefix.
         group = re.sub(r'\W', '_', group)
         # Drop the extension to get the raw test name.
         testname = re.sub(r'\.tar\.bz2', '', filename)
         # Drop any random numbers at the end of the test name if any
         testname = re.sub(r'\.(\d*)', '', testname)
         return (group, testname)