Fix test dargs, and statusmap creation.

client/bin/factory.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # DESCRIPTION :
 #
 # This library provides common types and routines for the factory ui
 # infrastructure.  This library explicitly does not import gtk, to
 # allow its use by the autotest control process.
@@ skipping 327 matching lines @@
         self._status_map = status_map
         self._log_data = LogData()
         self._std_dargs = {
             'test_widget_size': ui.test_widget_size,
             'trigger_set': status_map.test_db.kbd_shortcut_set,
             'status_file_path' : status_file_path,
             'test_list': test_list}
 
     def run_test(self, test):
         self._status_map.incr_count(test)
-        dargs = test.dargs
+        dargs = {}
+        dargs.update(test.dargs)
         dargs.update(self._std_dargs)
         test_tag = self._status_map.lookup_tag(test)
         dargs.update({'tag': test_tag,
                       'subtest_tag': test_tag,
                       'shared_dict': self._log_data.shared_dict})
         if test.drop_caches:
             self._job.drop_caches_between_iterations = True
         self._job.run_test(test.autotest_name, **dargs)
         self._job.drop_caches_between_iterations = False
         self._log_data.read_new_data()
         activated_ks = self._log_data.shared_dict.pop(
             'activated_kbd_shortcut', None)
         lookup = self._status_map.test_db.get_test_by_kbd_shortcut
         self.activated_kbd_shortcut_test = (
             activated_ks and lookup(activated_ks) or None)