| Index: client/site_tests/login_DBusCalls/login_DBusCalls.py
|
| diff --git a/client/site_tests/login_DBusCalls/login_DBusCalls.py b/client/site_tests/login_DBusCalls/login_DBusCalls.py
|
| index d516be3f888c78b3b3ee30809616e9d4bef82cf3..3c7a5765ce0f953e1652be99d48ae59c5522fdba 100644
|
| --- a/client/site_tests/login_DBusCalls/login_DBusCalls.py
|
| +++ b/client/site_tests/login_DBusCalls/login_DBusCalls.py
|
| @@ -3,19 +3,23 @@
|
| # found in the LICENSE file.
|
|
|
| import logging, os
|
| -from autotest_lib.client.bin import site_log_reader
|
| from autotest_lib.client.bin import utils
|
| -from autotest_lib.client.common_lib import error, utils
|
| +from autotest_lib.client.common_lib import error
|
| from autotest_lib.client.cros import constants as chromeos_constants
|
| -from autotest_lib.client.cros import ui_test
|
| +from autotest_lib.client.cros import cros_logging, cros_ui_test
|
|
|
| _SESSION_MANAGER_DEST='org.chromium.SessionManager'
|
| _SESSION_MANAGER_OBJECT='org.chromium.SessionManagerInterface'
|
| _SESSION_MANAGER_PATH='/org/chromium/SessionManager'
|
|
|
| -class login_DBusCalls(ui_test.UITest):
|
| +class login_DBusCalls(cros_ui_test.UITest):
|
| version = 1
|
|
|
| +
|
| + def initialize(self, creds = '$default'):
|
| + cros_ui_test.UITest.initialize(self, creds)
|
| +
|
| +
|
| def _call_session_manager_method(self, method, user='chronos'):
|
| """Call session manager dbus method as given user.
|
|
|
| @@ -35,9 +39,9 @@ class login_DBusCalls(ui_test.UITest):
|
|
|
| def _test_restart_entd(self):
|
| """Test the RestartEntd method."""
|
| - message_log = site_log_reader.LogReader()
|
| + message_log = cros_logging.LogReader()
|
| message_log.set_start_by_current()
|
| - ui_log = site_log_reader.LogReader(chromeos_constants.UI_LOG)
|
| + ui_log = cros_logging.LogReader(chromeos_constants.UI_LOG)
|
| ui_log.set_start_by_current()
|
| # Make sure we can call RestartEntd from user chronos.
|
| self._call_session_manager_method('RestartEntd')
|
|
|