
from autotest_lib.client.cros import chrome_test

class desktopui_SyncIntegrationTests(chrome_test.ChromeTestBase):
    version = 1

    def run_once(self):
        password_file = '%s/sync_password.txt' % self.bindir

        self.run_chrome_test('sync_integration_tests',
            ('--password-file-for-test=%s ' +
             '--test-terminate-timeout=300000') % password_file)


from autotest_lib.client.cros import chrome_test

class desktopui_SyncIntegrationTests(chrome_test.ChromeTestBase):
    version = 1

    binary_to_run = 'sync_integration_tests'
    cmd_line_params = '--test-terminate-timeout=120000'

    def run_once(self):
        self.run_chrome_test(self.binary_to_run, self.cmd_line_params)

Make the sync integration tests self-contained on autotest
Make the sync integration tests self-contained on autotest

In the past, the sync integration tests used to require a password file
stored on every test device in order to do a gaia sign in using
production gaia servers. This caused the tests to be brittle.

As of today, the sync integration tests no longer rely on a password
file, with gaia sign in being stubbed out locally.

This patch reconfigures the tests on autotest, so that it no longer
looks for a local password file.

In addition, the tests run much faster now, and therefore, we reduce the
max timeout to a more reasonable 2 minutes (in the extreme case).

BUG=chromium-os:11294, chromium-os:9262
TEST=sync_integration_tests

Review URL: http://codereview.chromium.org/6387004

git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@72561 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

  
  from autotest_lib.client.cros import chrome_test
  
  class desktopui_SyncIntegrationTests(chrome_test.ChromeTestBase):
      version = 1
  
+     binary_to_run = 'sync_integration_tests'
+     cmd_line_params = '--test-terminate-timeout=120000'
+ 
      def run_once(self):
-         password_file = '%s/sync_password.txt' % self.bindir
+         self.run_chrome_test(self.binary_to_run, self.cmd_line_params)
  
-         self.run_chrome_test('sync_integration_tests',
-             ('--password-file-for-test=%s ' +
-              '--test-terminate-timeout=300000') % password_file)
- 
Make the sync integration tests self-contained on autotest
## Code Before:

from autotest_lib.client.cros import chrome_test

class desktopui_SyncIntegrationTests(chrome_test.ChromeTestBase):
    version = 1

    def run_once(self):
        password_file = '%s/sync_password.txt' % self.bindir

        self.run_chrome_test('sync_integration_tests',
            ('--password-file-for-test=%s ' +
             '--test-terminate-timeout=300000') % password_file)

## Instruction:
Make the sync integration tests self-contained on autotest
## Code After:

from autotest_lib.client.cros import chrome_test

class desktopui_SyncIntegrationTests(chrome_test.ChromeTestBase):
    version = 1

    binary_to_run = 'sync_integration_tests'
    cmd_line_params = '--test-terminate-timeout=120000'

    def run_once(self):
        self.run_chrome_test(self.binary_to_run, self.cmd_line_params)
