Switch back to the old method of launching the login flow while keeping some of the benefits of the…

chrome/test/functional/chromeos_login.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import subprocess
 import sys
 
 import pyauto_functional  # Must be imported before pyauto
@@ skipping 37 matching lines @@
   def testGoodLogin(self):
     """Test that login is successful with valid credentials."""
     credentials = self._ValidCredentials()
     self.Login(credentials['username'], credentials['password'])
     login_info = self.GetLoginInfo()
     self.assertTrue(login_info['is_logged_in'], msg='Login failed.')
 
   def testBadUsername(self):
     """Test that login fails when passed an invalid username."""
     self.assertRaises(
-        pyauto_errors.LoginError,
+        pyauto_errors.JSONInterfaceError,
         lambda: self.Login('doesnotexist@fakedomain.org', 'badpassword'))
     login_info = self.GetLoginInfo()
     self.assertFalse(login_info['is_logged_in'],
                      msg='Login succeeded, with bad credentials.')
 
   def testBadPassword(self):
     """Test that login fails when passed an invalid password."""
     credentials = self._ValidCredentials()
     self.assertRaises(
-        pyauto_errors.LoginError,
+        pyauto_errors.JSONInterfaceError,
         lambda: self.Login(credentials['username'], 'badpassword'))
     login_info = self.GetLoginInfo()
     self.assertFalse(login_info['is_logged_in'],
                      msg='Login succeeded, with bad credentials.')
 
   def testLoginAsGuest(self):
     """Test we can login with guest mode."""
     self.LoginAsGuest()
     login_info = self.GetLoginInfo()
     self.assertTrue(login_info['is_logged_in'], msg='Not logged in at all.')
@@ skipping 110 matching lines @@
     # Should have 2 regular browser windows.
     info = self.GetBrowserInfo()
     self.assertEqual(2, len(info['windows']))
     self.assertFalse(info['windows'][0]['incognito'])
     self.assertFalse(info['windows'][1]['incognito'],
         msg='Expected a regular new window.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()