diff options
| author | pshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 17:14:47 +0000 |
|---|---|---|
| committer | pshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 17:14:47 +0000 |
| commit | d8f1fa0dbe1507b1330c19315ddcfb7c6ef68e70 (patch) | |
| tree | d90b048190965051104be32439a0b243e86280b2 | |
| parent | cbcf3b5b87f94c6c6533f0ed7da404547eae4f00 (diff) | |
| download | chromium_src-d8f1fa0dbe1507b1330c19315ddcfb7c6ef68e70.zip chromium_src-d8f1fa0dbe1507b1330c19315ddcfb7c6ef68e70.tar.gz chromium_src-d8f1fa0dbe1507b1330c19315ddcfb7c6ef68e70.tar.bz2 | |
Deleting Prefs related pyauto tests which are already being converted to browser_tests.
Please refer this CL.
https://codereview.chromium.org/21432002/
BUG=None.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/22272003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215913 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 2 | ||||
| -rwxr-xr-x | chrome/test/functional/prefs.py | 68 |
2 files changed, 0 insertions, 70 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index 77c20f5..69167c5 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -241,8 +241,6 @@ '-ntp.NTPTest.testDifferentProfileNotAppearInMostVisited', # No NaCl support on ChromeOS. '-nacl_sdk', - # You cannot adjust the downloads directory on ChromeOS. - '-prefs.PrefsTest.testDownloadDirPref', # ================================================== # Disabled tests that need to be investigated/fixed. diff --git a/chrome/test/functional/prefs.py b/chrome/test/functional/prefs.py index d8f2845..9a82de9 100755 --- a/chrome/test/functional/prefs.py +++ b/chrome/test/functional/prefs.py @@ -85,48 +85,6 @@ class PrefsTest(pyauto.PyUITest): self.ActivateTab(1) self.assertEqual(url2, self.GetActiveTabURL().spec()) - def testSessionRestoreShowBookmarkBar(self): - """Verify restore for bookmark bar visibility.""" - assert not self.GetPrefsInfo().Prefs(pyauto.kShowBookmarkBar) - self.SetPrefs(pyauto.kShowBookmarkBar, True) - self.assertEqual(True, self.GetPrefsInfo().Prefs(pyauto.kShowBookmarkBar)) - self.RestartBrowser(clear_profile=False) - self.assertEqual(True, self.GetPrefsInfo().Prefs(pyauto.kShowBookmarkBar)) - self.assertTrue(self.GetBookmarkBarVisibility()) - - def testDownloadDirPref(self): - """Verify download dir pref.""" - test_dir = os.path.join(self.DataDir(), 'downloads') - file_url = self.GetFileURLForPath(os.path.join(test_dir, 'a_zip_file.zip')) - download_dir = self.GetDownloadDirectory().value() - new_dl_dir = os.path.join(download_dir, 'My+Downloads Folder') - downloaded_pkg = os.path.join(new_dl_dir, 'a_zip_file.zip') - os.path.exists(new_dl_dir) and shutil.rmtree(new_dl_dir) - os.makedirs(new_dl_dir) - # Set pref to download in new_dl_dir - self.SetPrefs(pyauto.kDownloadDefaultDirectory, new_dl_dir) - self.DownloadAndWaitForStart(file_url) - self.WaitForAllDownloadsToComplete() - self.assertTrue(os.path.exists(downloaded_pkg)) - shutil.rmtree(new_dl_dir, ignore_errors=True) # cleanup - - def testToolbarButtonsPref(self): - """Verify toolbar buttons prefs.""" - # Assert defaults first - self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton)) - self.SetPrefs(pyauto.kShowHomeButton, True) - self.RestartBrowser(clear_profile=False) - self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton)) - - def testNetworkPredictionEnabledPref(self): - """Verify DNS prefetching pref.""" - # Assert default - self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kNetworkPredictionEnabled)) - self.SetPrefs(pyauto.kNetworkPredictionEnabled, False) - self.RestartBrowser(clear_profile=False) - self.assertFalse(self.GetPrefsInfo().Prefs( - pyauto.kNetworkPredictionEnabled)) - def testHomepagePrefs(self): """Verify homepage prefs.""" # "Use the New Tab page" @@ -188,20 +146,6 @@ class PrefsTest(pyauto.PyUITest): for pref in pref_list: self.assertEqual(self.GetPrefsInfo().Prefs(pref), False) - def testJavaScriptEnableDisable(self): - """Verify enabling disabling javascript prefs work """ - self.assertTrue( - self.GetPrefsInfo().Prefs(pyauto.kWebKitJavascriptEnabled)) - url = self.GetFileURLForDataPath( - os.path.join('javaScriptTitle.html')) - title1 = 'Title from script javascript enabled' - self.NavigateToURL(url) - self.assertEqual(title1, self.GetActiveTabTitle()) - self.SetPrefs(pyauto.kWebKitJavascriptEnabled, False) - title = 'This is html title' - self.NavigateToURL(url) - self.assertEqual(title, self.GetActiveTabTitle()) - def testHaveLocalStatePrefs(self): """Verify that we have some Local State prefs.""" self.assertTrue(self.GetLocalStatePrefsInfo()) @@ -283,18 +227,6 @@ class PrefsTest(pyauto.PyUITest): """ return self.ExecuteJavascript(script, windex=windex, tab_index=tab_index) - def testImageContentSettings(self): - """Verify image content settings show or hide images.""" - url = self.GetHttpURLForDataPath('settings', 'image_page.html') - self.NavigateToURL(url) - self.assertTrue(self._CheckForVisibleImage(), - msg='No visible images found.') - # Set to block all images from loading. - self.SetPrefs(pyauto.kDefaultContentSettings, {'images': 2}) - self.NavigateToURL(url) - self.assertFalse(self._CheckForVisibleImage(), - msg='At least one visible image found.') - def testImagesNotBlockedInIncognito(self): """Verify images are not blocked in Incognito mode.""" url = self.GetHttpURLForDataPath('settings', 'image_page.html') |