Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3084)

Unified Diff: chrome/test/functional/chromoting/chromoting_base.py

Issue 10837266: Revert 151717 - Initial checkin of the me2me pyauto automation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/functional/chromoting/auth.py ('k') | chrome/test/functional/chromoting/it2me_basic.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/functional/chromoting/chromoting_base.py
===================================================================
--- chrome/test/functional/chromoting/chromoting_base.py (revision 151721)
+++ chrome/test/functional/chromoting/chromoting_base.py (working copy)
@@ -1,45 +0,0 @@
-# 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.
-
-"""Common imports, setup, etc for chromoting tests."""
-
-import os
-
-
-def _SetupPaths():
- """Add chrome/test/functional to sys.path for importing pyauto_functional"""
- functional_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
- os.sys.path.append(functional_dir)
-
-_SetupPaths()
-
-
-import pyauto_functional # Must come before chromoting and pyauto.
-from pyauto_functional import Main
-import chromoting
-import pyauto
-
-
-class ChromotingBase(chromoting.ChromotingMixIn, pyauto.PyUITest):
- """Chromoting pyauto test base class.
-
- The following member variables can be used in the child classes:
- client_local: True if the client is on the same machines as host
- host: The chromoting host side, instance of ChromotingBase
- client: The chromoting client side, intance of ChromotingBase
- client_tab_index: The tab index to the chromoting client tab
- """
-
- def __init__(self, methodName):
- pyauto.PyUITest.__init__(self, methodName)
-
- self.client_local = (self.remote == None)
- self.host = self
- self.client = self if self.client_local else self.remote
- self.client_tab_index = 2 if self.client_local else 1
-
- def ExtraChromeFlags(self):
- """Add --allow-nacl-socket-api to connect chromoting successfully."""
- extra_chrome_flags = ['--allow-nacl-socket-api=*',]
- return pyauto.PyUITest.ExtraChromeFlags(self) + extra_chrome_flags
« no previous file with comments | « chrome/test/functional/chromoting/auth.py ('k') | chrome/test/functional/chromoting/it2me_basic.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698