summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/functional/PYAUTO_TESTS1
-rwxr-xr-xchrome/test/functional/chromeos_crosh.py (renamed from chrome/test/functional/chromeos_html_terminal.py)29
2 files changed, 1 insertions, 29 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index a39de25..4107b42 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -288,6 +288,7 @@
'chromeos': [
'chromeos_basic',
'chromeos_browser',
+ 'chromeos_crosh',
'chromeos_file_browser',
'chromeos_power',
'chromeos_prefs',
diff --git a/chrome/test/functional/chromeos_html_terminal.py b/chrome/test/functional/chromeos_crosh.py
index 36628ff..31dcc21 100755
--- a/chrome/test/functional/chromeos_html_terminal.py
+++ b/chrome/test/functional/chromeos_crosh.py
@@ -9,35 +9,6 @@ import pyauto_functional # must be imported before pyauto
import pyauto
-class ChromeosHTMLTerminalTest(pyauto.PyUITest):
- """Basic tests for ChromeOS HTML Terminal.
-
- Requires ChromeOS to be logged in.
- """
-
- def _GetExtensionInfoById(self, extensions, id):
- for x in extensions:
- if x['id'] == id:
- return x
- return None
-
- def testInstallAndUninstallSecureShellExt(self):
- """Basic installation test for HTML Terminal on ChromeOS."""
- crx_file_path = os.path.abspath(
- os.path.join(self.DataDir(), 'pyauto_private', 'apps',
- 'SecureShell-dev-0.7.9.3.crx'))
- ext_id = self.InstallExtension(crx_file_path)
- self.assertTrue(ext_id, 'Failed to install extension.')
- extension = self._GetExtensionInfoById(self.GetExtensionsInfo(), ext_id)
- self.assertTrue(extension['is_enabled'],
- msg='Extension was not enabled on installation.')
- self.assertFalse(extension['allowed_in_incognito'],
- msg='Extension was allowed in incognito on installation.')
- # Uninstall HTML Terminal extension
- self.assertTrue(self.UninstallExtensionById(ext_id),
- msg='Failed to uninstall extension.')
-
-
class CroshTest(pyauto.PyUITest):
"""Tests for crosh."""