Added login to UITests and added tests to filter.

A lot of UITests were failing due to being run without being logged in,
added code to login before the test are run.

Additionally added the tests that fail on the PFQ and BVT's to the
blacklisted tests list.

BUG=chromium-os:20022
TEST=Tested the BrowserTests and UITests wrapper on a ChromeOS VM.
R=zelidrag@chromium.org,nirnimesh@chromium.org

Review URL: http://codereview.chromium.org/7838033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102285 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/chromeos/autotest/files/client/site_tests/desktopui_BrowserTest/blacklists.py

+# Copyright (c) 2011 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.
+
+# TODO(rkc): Tests currently failing on the PFQ - resolve these.
+# http://code.google.com/p/chromium-os/issues/detail?id=20128
+blacklist = ['FindInPageControllerTest.AcceleratorRestoring',
+             'FindInPageControllerTest.FindMovesWhenObscuring',
+             'FindInPageControllerTest.FitWindow',
+             'BrowserNavigatorTest.NavigateFromBlankToOptionsInSameTab',
+             'BrowserNavigatorTest.NavigateFromOmniboxIntoNewTab',
+             'PrerenderBrowserTest.PrerenderDelayLoadPlugin',
+             'PrerenderBrowserTest.PrerenderIframeDelayLoadPlugin',
+             'PrerenderBrowserTest.PrerenderHTML5Audio',
+             'PrerenderBrowserTest.PrerenderHTML5Video',
+             'PrerenderBrowserTest.PrerenderHTML5VideoJs',
+             'NaClExtensionTest.WebStoreExtension',
+             'NaClExtensionTest.ComponentExtension',
+             'NaClExtensionTest.UnpackedExtension',
+             'ExtensionResourceRequestPolicyTest.Audio',
+             'ExtensionResourceRequestPolicyTest.Video',
+             'ExtensionCrashRecoveryTest.Basic',
+             'ExtensionCrashRecoveryTest.CloseAndReload',
+             'ExtensionCrashRecoveryTest.ReloadIndependentlyChangeTabs',
+             'ExtensionCrashRecoveryTest.ReloadIndependentlyNavigatePage',
+             'ExtensionCrashRecoveryTest.TwoExtensionsCrashFirst',
+             'ExtensionCrashRecoveryTest.TwoExtensionsCrashSecond',
+             'ExtensionCrashRecoveryTest.TwoExtensionsCrashBothAtOnce',
+             'ExtensionCrashRecoveryTest.TwoExtensionsOneByOne',
+             'ExtensionCrashRecoveryTest.TwoExtensionsReloadIndependently',
+             'ExtensionCrashRecoveryTest.CrashAndUninstall',
+             'ExtensionApiTest.WebNavigationUserAction',
+             'ExistingUserControllerTest.NewUserLogin',
+             'OmniboxApiTest.PopupStaysClosed']
+
+
+blacklist_vm = ['GPUBrowserTest.CanOpenPopupAndRenderWithWebGLCanvas']

chrome/test/chromeos/autotest/files/client/site_tests/desktopui_BrowserTest/desktopui_BrowserTest.py

@@ -4,15 +4,11 @@
 
 from autotest_lib.client.cros import chrome_test
 from autotest_lib.client.cros import cros_ui_test
-from autotest_lib.client.cros import login
+from blacklists import blacklist, blacklist_vm
 
 class desktopui_BrowserTest(chrome_test.ChromeTestBase, cros_ui_test.UITest):
     version = 1
-
     binary_to_run='browser_tests'
-    # PDF tests blacklisted for now: chromium: 78510
-    blacklist = ['PDFBrowserTest.Basic', 'PDFBrowserTest.Scroll',
-                 'PDFBrowserTest.FindAndCopy']
 
     def initialize(self, creds='$default'):
         chrome_test.ChromeTestBase.initialize(self, False)
@@ -24,7 +20,7 @@ class desktopui_BrowserTest(chrome_test.ChromeTestBase, cros_ui_test.UITest):
 
     def run_once(self, group=0, total_groups=4):
         tests_to_run = self.filter_bad_tests(
-            self.generate_test_list(self.binary_to_run, group, total_groups))
-        tests_to_run.extend(map(lambda(x): '-'+x, self.blacklist))
+            self.generate_test_list(self.binary_to_run, group, total_groups),
+            blacklist + blacklist_vm)
         self.run_chrome_test(self.binary_to_run,
                              '--gtest_filter=%s' % ':'.join(tests_to_run))

chrome/test/chromeos/autotest/files/client/site_tests/desktopui_UITest/blacklists.py

+# Copyright (c) 2011 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.
+
+# TODO(rkc): Tests currently failing on the PFQ - resolve these.
+# http://code.google.com/p/chromium-os/issues/detail?id=20128
+blacklist = [
+    # control$
+    'ResourceDispatcherTest.SniffHTMLWithNoContentType',
+    'ResourceDispatcherTest.SniffNoContentTypeNoData',
+    'ResourceDispatcherTest.ContentDispositionEmpty',
+    'ResourceDispatcherTest.ContentDispositionInline',
+    'ResourceDispatcherTest.CrossSiteNavigationNonBuffered',
+
+    # control.one$
+    'PPAPITest.Broker',
+    'PPAPITest.Core',
+    'PPAPITest.CursorControl',
+    'PPAPITest.Instance',
+    'PPAPITest.Graphics2D',
+    'PPAPITest.ImageData',
+    'PPAPITest.Buffer',
+    'PPAPITest.URLLoader',
+    'PPAPITest.PaintAggregator',
+    'PPAPITest.Scrollbar',
+    'PPAPITest.URLUtil',
+    'PPAPITest.CharSet',
+    'PPAPITest.Var',
+    'PPAPITest.VarDeprecated',
+    'PPAPITest.PostMessage',
+    'PPAPITest.Memory',
+    'PPAPITest.QueryPolicy',
+    'PPAPITest.VideoDecoder',
+    'PPAPITest.FileRef',
+    'PPAPITest.FileSystem',
+    'PPAPITest.UMA',
+    'OutOfProcessPPAPITest.Broker',
+    'OutOfProcessPPAPITest.Core',
+    'OutOfProcessPPAPITest.CursorControl',
+    'OutOfProcessPPAPITest.ImageData',
+    'OutOfProcessPPAPITest.Buffer',
+    'OutOfProcessPPAPITest.PaintAggregator',
+    'OutOfProcessPPAPITest.URLUtil',
+    'OutOfProcessPPAPITest.CharSet',
+    'OutOfProcessPPAPITest.Memory',
+    'OutOfProcessPPAPITest.VideoDecoder',
+    'NPAPIVisiblePluginTester.ClickToPlay',
+    'NPAPIAutomationEnabledTest.LoadAllBlockedPlugins',
+    'HistoryTester.ConsiderRedirectAfterGestureAsUserInitiated',
+
+    # control.two$
+    'CheckFalseTest.CheckFails']
+
+
+blacklist_vm = []

chrome/test/chromeos/autotest/files/client/site_tests/desktopui_UITest/desktopui_UITest.py

-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
 from autotest_lib.client.cros import chrome_test
+from autotest_lib.client.cros import cros_ui_test
+from blacklists import blacklist, blacklist_vm
 
-class desktopui_UITest(chrome_test.ChromeTestBase):
+class desktopui_UITest(chrome_test.ChromeTestBase, cros_ui_test.UITest):
     version = 1
-
     binary_to_run='ui_tests'
-    blacklist = []
+
+    def initialize(self, creds='$default'):
+        chrome_test.ChromeTestBase.initialize(self, False)
+        cros_ui_test.UITest.initialize(self, creds)
+
+    def cleanup(self):
+        cros_ui_test.UITest.cleanup(self)
+        chrome_test.ChromeTestBase.cleanup(self)
 
     def run_once(self, group=0, total_groups=4):
         tests_to_run = self.filter_bad_tests(
-            self.generate_test_list(self.binary_to_run, group, total_groups))
-        tests_to_run.extend(map(lambda(x): '-'+x, self.blacklist))
+            self.generate_test_list(self.binary_to_run, group, total_groups),
+            blacklist + blacklist_vm)
         self.run_chrome_test(self.binary_to_run,
                              '--gtest_filter=%s' % ':'.join(tests_to_run))