| 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 import logging, os |   5 import logging, os | 
|   6 from autotest_lib.client.bin import utils |   6 from autotest_lib.client.bin import utils | 
|   7 from autotest_lib.client.common_lib import error |   7 from autotest_lib.client.common_lib import error | 
|   8 from autotest_lib.client.cros import constants as chromeos_constants |   8 from autotest_lib.client.cros import constants as chromeos_constants | 
|   9 from autotest_lib.client.cros import cros_logging, cros_ui_test |   9 from autotest_lib.client.cros import cros_logging, cros_ui_test | 
 |  10 from autotest_lib.client.cros import login | 
|  10  |  11  | 
|  11 _SESSION_MANAGER_DEST='org.chromium.SessionManager' |  12 _SESSION_MANAGER_DEST='org.chromium.SessionManager' | 
|  12 _SESSION_MANAGER_OBJECT='org.chromium.SessionManagerInterface' |  13 _SESSION_MANAGER_OBJECT='org.chromium.SessionManagerInterface' | 
|  13 _SESSION_MANAGER_PATH='/org/chromium/SessionManager' |  14 _SESSION_MANAGER_PATH='/org/chromium/SessionManager' | 
|  14  |  15  | 
|  15 class login_DBusCalls(cros_ui_test.UITest): |  16 class login_DBusCalls(cros_ui_test.UITest): | 
|  16     version = 1 |  17     version = 1 | 
|  17  |  18  | 
|  18  |  19  | 
|  19     def initialize(self, creds = '$default'): |  20     def initialize(self, creds = '$default'): | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  61                 lambda: message_log.can_find(grep_bait), |  62                 lambda: message_log.can_find(grep_bait), | 
|  62                 timeout=30, |  63                 timeout=30, | 
|  63                 exception=error.TestFail('Did not find %s in message log' % |  64                 exception=error.TestFail('Did not find %s in message log' % | 
|  64                                          grep_bait)) |  65                                          grep_bait)) | 
|  65         finally: |  66         finally: | 
|  66             logging.debug('Message log from RestartEntd: ' + |  67             logging.debug('Message log from RestartEntd: ' + | 
|  67                           message_log.get_logs()) |  68                           message_log.get_logs()) | 
|  68  |  69  | 
|  69  |  70  | 
|  70     def run_once(self): |  71     def run_once(self): | 
|  71         self.login() |  72         login.wait_for_cryptohome() | 
|  72         self._test_restart_entd() |  73         self._test_restart_entd() | 
| OLD | NEW |