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

chrome/test/functional/test_utils.py

-# 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.
 
 import copy
 import ctypes
 import email
 import logging
 import os
 import platform
 import shutil
@@ skipping 312 matching lines @@
   assert pyauto.PyUITest.IsLinux() or pyauto.PyUITest.IsChromeOS()
   process = subprocess.Popen('ps h -o rss -p %s' % pid, shell=True,
                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   stdout = process.communicate()[0]
   if stdout:
     return float(stdout.strip()) / 1024
   else:
     return 0
 
 
-def GetCredsKey():
-  """Get the credential key associated with a bot on the waterfall.
-
-  The key is associated with the proper credentials in the text data file stored
-  in the private directory. The key determines a bot's OS and machine name. Each
-  key credential is associated with its own user/password value. This allows
-  sync integration tests to run in parallel on all bots.
-
-  Returns:
-    A String of the credentials key for the specified bot. Otherwise None.
-  """
-  if pyauto.PyUITest.IsWin():
-    system_name = 'win'
-  elif pyauto.PyUITest.IsLinux():
-    system_name = 'linux'
-  elif pyauto.PyUITest.IsMac():
-    system_name = 'mac'
-  else:
-    return None
-  node = platform.uname()[1].split('.')[0]
-  creds_key = 'test_google_acct_%s_%s' % (system_name, node)
-  return creds_key
-
-
-def SignInToSyncAndVerifyState(test, account_key):
-  """Sign into sync and verify that it was successful.
-
-  Args:
-    test: derived from pyauto.PyUITest - base class for UI test cases.
-    account_key: the credentials key in the private account dictionary file.
-  """
-  creds = test.GetPrivateInfo()[account_key]
-  username = creds['username']
-  password = creds['password']
-  test.assertTrue(test.GetSyncInfo()['last synced'] == 'Never')
-  test.assertTrue(test.SignInToSync(username, password))
-  test.assertTrue(test.GetSyncInfo()['last synced'] == 'Just now')
-
-
 def LoginToDevice(test, test_account='test_google_account'):
   """Login to the Chromeos device using the given test account.
 
   If no test account is specified, we use test_google_account as the default.
   You can choose test accounts from -
   chrome/test/data/pyauto_private/private_tests_info.txt
 
   Args:
     test_account: The account used to login to the Chromeos device.
   """
@@ skipping 67 matching lines @@
   """This test opens crosh.
 
   This function assumes that no browser windows are open.
   """
   self.assertEqual(0, self.GetBrowserWindowCount())
   self.OpenCrosh()
   self.assertEqual(1, self.GetBrowserWindowCount())
   self.assertEqual(1, self.GetTabCount(),
       msg='Could not open crosh')
   self.assertEqual('crosh', self.GetActiveTabTitle())