autotest: Make WM tests wait for initial browser window.

client/site_tests/desktopui_WindowManagerFocusNewWindows/desktopui_WindowManagerFocusNewWindows.py

 # Copyright (c) 2010 The Chromium OS 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, time
-from autotest_lib.client.bin import site_ui_test, test
+from autotest_lib.client.bin import site_login, site_ui_test, test
 from autotest_lib.client.common_lib import error
 
 class desktopui_WindowManagerFocusNewWindows(site_ui_test.UITest):
     version = 1
 
     def __check_active_window(self, id, info):
         """Check that a particular window is active.
 
         Args:
             id: int window ID
             info: AutoX.WindowInfo object corresponding to 'id'
 
         Raises:
             error.TestFail: if a condition timed out
         """
         try:
             self.autox.await_condition(
+                lambda: self.autox.get_active_window_property() == id,
+                desc='Waiting for _NET_ACTIVE_WINDOW to contain 0x%x' % id)

[Daniel Erat, 2010/09/17 17:31:57]

The window manager sets the property before it assigns the focus, so it makes
sense to check them in the same order in the test.

[kmixter1, 2010/09/17 20:32:37]

Not sure if this reordering is being done to be more consistent with the
underlying code (which makes sense) or is being done to try to avoid some kind
of race condition - if the latter, it doesn't seem like it would be improved
much.

[Daniel Erat, 2010/09/17 20:39:21]

It's the former. :-)

+            self.autox.await_condition(
                 lambda: info.is_focused,
                 desc='Waiting for window 0x%x to be focused' % id)
-            self.autox.await_condition(
-                lambda: self.autox.get_active_window_property() == id,
-                desc='Waiting for _NET_ACTIVE_WINDOW to contain 0x%x' % id)
 
             # get_geometry() returns a tuple, so we need to construct a tuple to
             # compare against it.
             fullscreen_dimensions = \
                 tuple([0, 0] + list(self.autox.get_screen_size()))
             self.autox.await_condition(
                 lambda: info.get_geometry() == fullscreen_dimensions,
                 desc='Waiting for window 0x%x to fill the screen' % id)
 
             self.autox.await_condition(
                 lambda: self.autox.get_top_window_id_at_point(200, 200) == id,
                 desc='Waiting for window 0x%x to be on top' % id)
 
         except self.autox.ConditionTimeoutError as exception:
             raise error.TestFail(
                 'Timed out on condition: %s' % exception.__str__())
 
     def run_once(self):
+        # Make sure that we don't have the initial browser window popping up in
+        # the middle of the test.
+        site_login.wait_for_initial_chrome_window()
+
         self.autox = self.get_autox()
 
         # Create a window and check that we switch to it.
         win = self.autox.create_and_map_window(
             width=200, height=200, title='test')
         info = self.autox.get_window_info(win.id)
         self.__check_active_window(win.id, info)
 
         # Create a second window.
         win2 = self.autox.create_and_map_window(
             width=200, height=200, title='test 2')
         info2 = self.autox.get_window_info(win2.id)
         self.__check_active_window(win2.id, info2)
 
-        # Cycle backwards to the first window.
-        self.autox.send_hotkey('Alt-Shift-Tab')
-        self.__check_active_window(win.id, info)
-
-        # Cycle forwards to the second window.
-        self.autox.send_hotkey('Alt-Tab')
-        self.__check_active_window(win2.id, info2)
-
         # Now destroy the second window and check that the WM goes back
         # to the first window.
         win2.destroy()
         self.__check_active_window(win.id, info)