[sync] Divorce python sync test server chromiumsync.py from testserver.py

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
 
 Ref: http://dev.chromium.org/developers/testing/pyauto
@@ skipping 740 matching lines @@
     """Terminate the given pid.
 
     If the pid refers to a renderer, use KillRendererProcess instead.
     """
     if PyUITest.IsWin():
       subprocess.call(['taskkill.exe', '/T', '/F', '/PID', str(pid)])
     else:
       os.kill(pid, signal.SIGTERM)
 
   @staticmethod
-  def ChromeFlagsForSyncTestServer(port, xmpp_port):
-    """Creates the flags list for the browser to connect to the sync server.
-
-    Use the |ExtraBrowser| class to launch a new browser with these flags.
-
-    Args:
-      port: The HTTP port number.
-      xmpp_port: The XMPP port number.
-
-    Returns:
-      A list with the flags.
-    """
-    return [
-      '--sync-url=http://127.0.0.1:%s/chromiumsync' % port,
-      '--sync-allow-insecure-xmpp-connection',
-      '--sync-notification-host-port=127.0.0.1:%s' % xmpp_port,
-      '--sync-notification-method=p2p',
-    ]
-
-  @staticmethod
   def GetPrivateInfo():
     """Fetch info from private_tests_info.txt in private dir.
 
     Returns:
       a dictionary of items from private_tests_info.txt
     """
     private_file = os.path.join(
         PyUITest.DataDir(), 'pyauto_private', 'private_tests_info.txt')
     assert os.path.exists(private_file), '%s missing' % private_file
     return PyUITest.EvalDataFrom(private_file)
@@ skipping 62 matching lines @@
         logging.debug('WaitUntil(%s:%d %s) still waiting. '
                       'Expecting %s. Last returned %s.',
                       os.path.basename(inspect.getsourcefile(function)),
                       inspect.getsourcelines(function)[1],
                       function_info,
                       True if expect_retval is None else expect_retval,
                       retval)
       time.sleep(retry_sleep)
     return retval if return_retval else False
 
-  def StartSyncServer(self):
-    """Start a local sync server.
-
-    Adds a dictionary attribute 'ports' in returned object.
-
-    Returns:
-      A handle to Sync Server, an instance of TestServer
-    """
-    sync_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_SYNC,
-                                       '127.0.0.1',
-                                       pyautolib.FilePath(''))
-    assert sync_server.Start(), 'Could not start sync server'
-    sync_server.ports = dict(port=sync_server.GetPort(),
-                             xmpp_port=sync_server.GetSyncXmppPort())
-    logging.debug('Started sync server at ports %s.', sync_server.ports)
-    return sync_server
-
-  def StopSyncServer(self, sync_server):
-    """Stop the local sync server."""
-    assert sync_server, 'Sync Server not yet started'
-    assert sync_server.Stop(), 'Could not stop sync server'
-    logging.debug('Stopped sync server at ports %s.', sync_server.ports)
-
   def StartFTPServer(self, data_dir):
     """Start a local file server hosting data files over ftp://
 
     Args:
       data_dir: path where ftp files should be served
 
     Returns:
       handle to FTP Server, an instance of TestServer
     """
     ftp_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_FTP,
@@ skipping 5599 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()