| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 # DESCRIPTION : | 6 # DESCRIPTION : |
| 7 # | 7 # |
| 8 # This library provides common types and routines for the factory ui | 8 # This library provides common types and routines for the factory ui |
| 9 # infrastructure. This library explicitly does not import gtk, to | 9 # infrastructure. This library explicitly does not import gtk, to |
| 10 # allow its use by the autotest control process. | 10 # allow its use by the autotest control process. |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 dargs.update(self._std_dargs) | 341 dargs.update(self._std_dargs) |
| 342 test_tag = self._status_map.lookup_tag(test) | 342 test_tag = self._status_map.lookup_tag(test) |
| 343 dargs.update({'tag': test_tag, | 343 dargs.update({'tag': test_tag, |
| 344 'subtest_tag': test_tag, | 344 'subtest_tag': test_tag, |
| 345 'shared_dict': self._log_data.shared_dict}) | 345 'shared_dict': self._log_data.shared_dict}) |
| 346 if test.drop_caches: | 346 if test.drop_caches: |
| 347 self._job.drop_caches_between_iterations = True | 347 self._job.drop_caches_between_iterations = True |
| 348 self._job.run_test(test.autotest_name, **dargs) | 348 self._job.run_test(test.autotest_name, **dargs) |
| 349 self._job.drop_caches_between_iterations = False | 349 self._job.drop_caches_between_iterations = False |
| 350 self._log_data.read_new_data() | 350 self._log_data.read_new_data() |
| 351 activated_ks = self._log_data.shared_dict.pop('activated_kbd_shortcut') | 351 activated_ks = self._log_data.shared_dict.pop( |
| 352 'activated_kbd_shortcut', None) |
| 352 lookup = self._status_map.test_db.get_test_by_kbd_shortcut | 353 lookup = self._status_map.test_db.get_test_by_kbd_shortcut |
| 353 self.activated_kbd_shortcut_test = ( | 354 self.activated_kbd_shortcut_test = ( |
| 354 activated_ks and lookup(activated_ks) or None) | 355 activated_ks and lookup(activated_ks) or None) |
| OLD | NEW |