Fix testNaClSDK

functional/PYAUTO_TESTS

 # 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.
 #
 # This file lists the pyauto tests that run as a part of the functional test
 # suite.
 #
 # Tests can be enabled on a per-platform basis. Tests not listed here will
 # not be run.
 #
@@ skipping 22 matching lines @@
   # This is the suite that gets run on 'Chromium' builds.
   'CONTINUOUS': {
     'all': [
       'about_plugins_ui.AboutPluginsUITest',
       'apptest',
       'autofill',
       'bookmark_bar',
       'bookmarks',
       'browser',
       'browsing_data',
-      'chromoting_basic',

[Nirnimesh, 2012/05/09 19:48:36]

Please re-sync. These should not be in your CL

[Pooja Nihalani, 2012/05/09 23:31:41]

Done.

       'codesign',
       'content',
       'cookies',
       'crash_reporter',
       'databases',
       'downloads',
       'execute_javascript',
       'extensions',
       'find_in_page',
       'flash',
@@ skipping 24 matching lines @@
       'pyauto_webdriver',
       'search_engines',
       'shortcuts',
       'special_tabs',
       'sync.SyncTest',
       'test_basic',
       'test_pyauto',
       'themes',
       'youtube',
 
-      # One-click infobars disabled on M20 by r135749.
-      # Re-enable for M21 after branch point.
-      '-infobars.OneClickInfobarTest',
-
       # ==================================================
       # Disabled tests that need to be investigated/fixed.
       # ==================================================
       # crbug.com/83686
       '-autofill.AutofillTest.testFillProfileCrazyCharacters',
       # crbug.com/102798
       '-autofill.AutofillTest.testMergeAggregatedProfilesWithSameAddress',
       # crbug.com/99475
       '-autofill.AutofillTest.testNoDuplicatePhoneNumsInPrefs',
       # crbug.com/123396
       '-fullscreen_mouselock.FullscreenMouselockTest.testPatternsForFSAndML',
-      # crbug.com/100593
-      '-nacl_sdk.NaClSDKTest.testVerifyNaClPlugin',
+      # crbug.com/126388
+      '-indexeddb.IndexedDBTest.testIndexedDBNullKeyPathPersistence',
+      # crbug.com/126311
+      '-infobars.OneClickInfobarTest.testDisplayOneClickInfobarPerProfile',
+      # crbug.com/126261
+      '-instant.InstantSettingsTest.testEnableDisableInstant',
+      '-instant.InstantTest.testExtnPageCanDismissInstant',
+      '-instant.InstantTest.testFindInCanDismissInstant',
+      '-instant.InstantTest.testInstantDisabledForJavaScript',
+      '-instant.InstantTest.testInstantDisabledForURLs',
+      '-instant.InstantTest.testInstantDisabledInIncognito',
+      '-instant.InstantTest.testInstantLoadsFor100CharsLongQuery',
+      '-instant.InstantTest.testInstantNavigation',
+      '-instant.InstantTest.testInstantWithSearchEngineOtherThanGoogle',
+      '-instant.InstantTest.testNTPCanDismissInstant',
+      '-instant.InstantTest.testNewWindowCanDismissInstant',
+      '-instant.InstantTest.testPreFetchInstantURLNotInHistory',
+      # crbug.com/126311
+      '-multiprofile.MultiprofileTest.test20NewProfiles',
+      '-multiprofile.MultiprofileTest.testBasic',
       # crbug.com/105560
       '-notifications',
       # crbug.com/99506
       '-notifications.NotificationsTest.testSpecialURLNotification',
+      # crbug.com/126311
+      '-ntp.NTPTest.testDifferentProfileNotAppearInMostVisited',
       # crbug.com/71715
       '-omnibox.OmniboxTest.testHistoryResult',
       # crbug.com/123019
       '-omnibox.OmniboxTest.testAutoCompleteForNonAsciiSearch',
-      # crbug.com/117720
-      '-passwords.PasswordTest.testPasswordAutofilledInIncognito',
       # crbug.com/86524
       '-plugins.PluginsTest.testAllowPluginException',
       # crbug.com/97140
       '-plugins.PluginsTest.testDisableEnableAllPlugins',
       # crbug.com/85307
       '-plugins.PluginsTest.testKillAndReloadAllPlugins',
       # crbug.com/115427
       '-policy.PolicyTest.testAlwaysAuthorizePlugins',
       # crbug.com/118054
       '-policy.PolicyTest.testApplicationLocaleValue',
@@ skipping 176 matching lines @@
       'chromeos_security',
       'chromeos_time',
       'chromeos_update',
       'chromeos_wifi_sanity',
 
       # ===========================
       # Permanently-disabled tests.
       # ===========================
       # You cannot resize the browser window on ChromeOS.
       '-browser.BrowserTest.testWindowResize',
-      # ChromeOS doesn't yet support the chromoting host.
-      '-chromoting_basic',
       # No codesign verification on ChromeOS.
       '-codesign',
       # Import tests are invalid on ChromeOS since Chrome is the only browser.
       '-imports',
       # Sync is already signed in with the login account.
       # So one-click infobar tests do tno apply to chromeos.
       '-infobars.OneClickInfobarTest',
       # Multi-profile doesn't apply to chromeos yet.
       '-multiprofile',
       '-ntp.NTPTest.testDifferentProfileNotAppearInMostVisited',
@@ skipping 155 matching lines @@
   # This the suite that gets run on 'Google Chrome' builds.
   'FULL': {
     'all': [
       '@CONTINUOUS',
       'about_plugins_ui.ChromeAboutPluginsUITest',
       'https.SSLTest',
       'media.media_basic_playback',
       'nacl_sdk',
       'translate',
 
-      # ===========================
-      # Permanently-disabled tests.
-      # ===========================
-      # The chromoting webapp isn't currently available when FULL is run.
-      '-chromoting_basic',
-
       # ==================================================
       # Disabled tests that need to be investigated/fixed.
       # ==================================================
       # The source is behind.  Waiting for dev to automate the update.
-      '-nacl_sdk.NaClSDKTest.testVerifyNaClSDKChecksum',
-      # crbug.com/98681
-      '-nacl_sdk.NaClSDKTest.testNaClSDK',
-      '-nacl_sdk.NaClSDKTest.testVerifyPrereleaseGallery',
       # crbug.com/109160
       '-execute_javascript.ExecuteJavascriptTest.testExecuteJavascriptInExtension',
     ],
 
     'win': [
       'gpu',
 
       # ===========================
       # Permanently-disabled tests.
       # ===========================
@@ skipping 62 matching lines @@
       '-browsing_data.BrowsingDataTest.testClearCookies',
       '-databases.DatabasesTest.testDeleteAndUpdateDatabase',
     ],
 
     'chromeos': [
       # ===========================
       # Permanently-disabled tests.
       # ===========================
       # No NaCl support on ChromeOS.
       '-nacl_sdk',
-
       # ==================================================
       # Disabled tests that need to be investigated/fixed.
       # ==================================================
       # Session restore not working with PyAuto.  crosbug.com/12648
       '-translate.TranslateTest.testSessionRestore',
       # Deal with i18n chars.  crosbug.com/12639
       '-translate.TranslateTest.testDownloadsNotTranslated',
     ],
   },
 
-  # Performance tests.
-  # TODO(dennisjeffrey): Modify desktopui_PyAutoPerfTests autotest to use this
-  # suite instead of CHROMEOS_PERF.
-  'PERFORMANCE': {
-    'all': [
-      'perf',
-    ],
-    'win': [
-      '-perf.GPUPerfTest',  # Fails. Discuss with prachij@.
-      '-perf.LiveGamePerfTest',  # Requires linux /proc/stat.
-      '-perf.MemoryTest',  # Designed only for ChromeOS.
-      '-perf.NetflixPerfTest',  # Netflix plugin not available.
-      '-perf.PageCyclerTest',  # Requires page cycler data files on QA bots.
-      '-perf.YoutubePerfTest',  # AttributeError: AssertPlayingState.
-    ],
-    'mac': [
-      '-perf.GPUPerfTest',  # Fails. Discuss with prachij@.
-      '-perf.LiveGamePerfTest',  # Requires linux /proc/stat.
-      '-perf.MemoryTest',  # Designed only for ChromeOS.
-      '-perf.NetflixPerfTest',  # Netflix plugin not available.
-      '-perf.PageCyclerTest',  # Requires page cycler data files on QA bots.
-      '-perf.YoutubePerfTest',  # AttributeError: AssertPlayingState.
-    ],
-    'linux': [
-      '-perf.GPUPerfTest',  # Fails. Discuss with prachij@.
-      '-perf.MemoryTest',  # Designed only for ChromeOS.
-      '-perf.NetflixPerfTest',  # Netflix plugin not available.
-      '-perf.PageCyclerTest',  # Requires page cycler data files on QA bots.
-      '-perf.WebGLTest',  # May not render WebGL; need to verify on QA bot.
-      '-perf.YoutubePerfTest',  # AttributeError: AssertPlayingState.
-    ],
-    'chromeos': [
-      '-perf.GPUPerfTest',  # Not designed for ChromeOS.
-    ],
-  },
-
   'PERFORMANCE_LAB': {
     'all': [
       'perf.BenchmarkPerfTest.testV8BenchmarkSuite',
       'perf.FlashTest.testFlashGaming',
       'perf.ScrollTest.testGooglePlusScroll',
       'perf.TabPerfTest.test20Tabs',
       'perf.WebGLTest.testWebGLSpaceRocks',
     ],
   },
 
@@ skipping 35 matching lines @@
   },
 
   # ChromeOS policy tests. These are shared with Desktop Chrome tests, but
   # require custom setup on ChromeOS.
   'CHROMEOS_POLICY': {
     'chromeos': [
       'chromeos_ephemeral',
       'chromeos_onc',
       'policy',
       'policy_prefs_ui',
-      # TODO(craigdh): Determine why this test is crashing PyAuto.
-      '-chromeos_onc.ChromeosONC.testAddBacktoBackONC',
       # crbug.com/115427
       '-policy.PolicyTest.testAlwaysAuthorizePlugins',
       # crbug.com/118054
       '-policy.PolicyTest.testApplicationLocaleValue',
       # crbug.com/118123
       '-policy.PolicyTest.testExtensionInstallFromForceList',
       '-policy.PolicyTest.testSetDownloadDirectory',
       # This tests the value "0" for the RestoreOnStartup policy, which is not
       # supported on ChromeOS.
       '-policy.PolicyTest.testStartupOptionsHomepage',
@@ skipping 49 matching lines @@
        'media.media_stat_perf',
        'media.media_seek_perf',
      ],
   },
 
   # WebRTC MediaStream tests. Requires webcam and audio device to be present on
   # the test machine.
   'WEBRTC': {
     'all': [
       'media_stream_infobar',
+    ],
+    'linux': [
       'webrtc_call',
     ],
   },
 }