Merge remote branch 'autotest-upstream/master' into autotest-merge

server/autotest_unittest.py

 #!/usr/bin/python
 
 __author__ = "raphtee@google.com (Travis Miller)"
 
 import unittest, os, tempfile, logging
 
 import common
 from autotest_lib.server import autotest, utils, hosts, server_job, profilers
 from autotest_lib.client.bin import sysinfo
 from autotest_lib.client.common_lib import utils as client_utils, packages
@@ skipping 187 matching lines @@
                             run_obj.remote_control_file + '.state',
                             run_obj.manual_control_file,
                             run_obj.manual_control_file + '.state']
         cmd = ';'.join('rm -f ' + control for control in delete_file_list)
         self.host.run.expect_call(cmd, ignore_status=True)
 
         utils.get.expect_call(control).and_return("temp")
 
         c = autotest.global_config.global_config
         c.get_config_value.expect_call("PACKAGES",
-            'fetch_location', type=list).and_return(['repo'])
+            'fetch_location', type=list, default=[]).and_return(['repo'])
         pkgmgr = packages.PackageManager.expect_new('autotest',
                                                      repo_urls=['repo'],
                                                      hostname='hostname')
 
         cfile = self.god.create_mock_class(file, "file")
         cfile_orig = "original control file"
         cfile_new = "args = []\njob.add_repository(['repo'])\n"
         cfile_new += cfile_orig
 
         autotest.open.expect_call("temp").and_return(cfile)
@@ skipping 130 matching lines @@
 
 
     def test_fails_with_exception(self):
         self.assertEqual(False, self.mixin.run_test('sleeptest'))
         self.assert_("job.run_test('sleeptest')\n" in self.control_file)
         self.assertEqual(self.mixin, self.host)
 
 
 if __name__ == "__main__":
     unittest.main()