diff options
3 files changed, 16 insertions, 15 deletions
diff --git a/chrome/test/telemetry/chromeos/login_unittest.py b/chrome/test/telemetry/chromeos/login_unittest.py index 0433990..7675e95 100644 --- a/chrome/test/telemetry/chromeos/login_unittest.py +++ b/chrome/test/telemetry/chromeos/login_unittest.py @@ -19,7 +19,8 @@ class CrOSAutoTest(unittest.TestCase): self._cri = cros_interface.CrOSInterface(options.cros_remote, options.cros_ssh_identity) self._is_guest = options.browser_type == 'cros-chrome-guest' - self._email = '' if self._is_guest else 'test@test.test' + self._username = '' if self._is_guest else options.browser_options.username + self._password = options.browser_options.password def _IsCryptohomeMounted(self): """Returns True if cryptohome is mounted""" @@ -83,7 +84,7 @@ class CrOSAutoTest(unittest.TestCase): self.assertEquals(chronos_fs, 'guestfs') else: home, _ = self._cri.RunCmdOnDevice(['/usr/sbin/cryptohome-path', - 'user', self._email]) + 'user', self._username]) self.assertEquals(self._cri.FilesystemMountedAt(home.rstrip()), chronos_fs) @@ -99,7 +100,7 @@ class CrOSAutoTest(unittest.TestCase): self.assertEquals(not self._is_guest, login_status['isRegularUser']) self.assertEquals(self._is_guest, login_status['isGuest']) - self.assertEquals(login_status['email'], self._email) + self.assertEquals(login_status['email'], self._username) self.assertFalse(login_status['isScreenLocked']) def _IsScreenLocked(self, browser): @@ -131,16 +132,16 @@ class CrOSAutoTest(unittest.TestCase): ''') self.assertFalse(ErrorBubbleVisible()) browser.oobe.ExecuteJavaScript(''' - Oobe.authenticateForTesting('test@test.test', 'bad'); - ''') + Oobe.authenticateForTesting('%s', 'bad'); + ''' % self._username) util.WaitFor(ErrorBubbleVisible, 10) self.assertTrue(self._IsScreenLocked(browser)) def _UnlockScreen(self, browser): logging.info('Unlocking') browser.oobe.ExecuteJavaScript(''' - Oobe.authenticateForTesting('test@test.test', ''); - ''') + Oobe.authenticateForTesting('%s', '%s'); + ''' % (self._username, self._password)) util.WaitFor(lambda: not browser.oobe, 10) self.assertFalse(self._IsScreenLocked(browser)) diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py index 7868519..90ab3d1 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py +++ b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py @@ -37,3 +37,5 @@ class CrosBrowserOptions(ChromeBrowserOptions): # Create a browser with oobe property. self.create_browser_with_oobe = False self.auto_login = True + self.username = 'test@test.test' + self.password = '' diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py index 14e52c9..b84833c 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py @@ -41,16 +41,14 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): self._SetBranchNumber(self._GetChromeVersion()) - self._username = 'test@test.test' - self._password = '' - self._login_ext_dir = None if not self._use_oobe_login_for_testing: self._login_ext_dir = os.path.join(os.path.dirname(__file__), 'chromeos_login_ext') # Push a dummy login extension to the device. - # This extension automatically logs in test user self._username. + # This extension automatically logs in test user specified by + # self.browser_options.username. # Note that we also perform this copy locally to ensure that # the owner of the extensions is set to chronos. logging.info('Copying dummy login extension to the device') @@ -75,7 +73,7 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): # Delete test user's cryptohome vault (user data directory). if not self.browser_options.dont_override_profile: self._cri.RunCmdOnDevice(['cryptohome', '--action=remove', '--force', - '--user=%s' % self._username]) + '--user=%s' % self.browser_options.username]) if self.browser_options.profile_dir: cri.RmRF(self.profile_directory) cri.PushFile(self.browser_options.profile_dir + '/Default', @@ -317,7 +315,7 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): def _IsCryptohomeMounted(self): """Returns True if a cryptohome vault at the user mount point.""" - profile_path = self._CryptohomePath(self._username) + profile_path = self._CryptohomePath(self.browser_options.username) mount = self._cri.FilesystemMountedAt(profile_path) return mount and mount.startswith('/home/.shadow/') @@ -405,8 +403,8 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): raise exceptions.LoginException('Oobe.loginForTesting js api missing') self.oobe.ExecuteJavaScript( - 'Oobe.loginForTesting(\'%s\', \'%s\');' % (self._username, - self._password)) + 'Oobe.loginForTesting(\'%s\', \'%s\');' + % (self.browser_options.username, self.browser_options.password)) try: util.WaitFor(self._IsLoggedIn, 60) |