summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-19 19:54:05 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-19 19:54:05 +0000
commit2c2b01d0ce997b46ab17fab4b15c31595f8794f9 (patch)
treeff345bbe08beb74fbb4355799a7ded4644468dfa /chrome
parent0a8b732762e4d4169bc18a0851fd2929ff5e8bda (diff)
downloadchromium_src-2c2b01d0ce997b46ab17fab4b15c31595f8794f9.zip
chromium_src-2c2b01d0ce997b46ab17fab4b15c31595f8794f9.tar.gz
chromium_src-2c2b01d0ce997b46ab17fab4b15c31595f8794f9.tar.bz2
Set sync-notification-method to "transitional" for integration tests.
The sync integration tests do not have a fake Tango server that provides clients with XMPP notifications. Therefore, we rely on clients nudging each other via the server when changes need to be synced. Until we implement a fake Tango server, this switch needs to be set for all integration tests. BUG=48141 TEST=sync_integration_tests:echo Review URL: http://codereview.chromium.org/2834051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/live_sync/live_sync_test.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index 59b1e5d..d2d8b16 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -22,7 +22,7 @@ void LiveSyncTest::SetUp() {
// At this point, the browser hasn't been launched, and no services are
// available. But we can verify our command line parameters and fail
// early.
- const CommandLine* cl = CommandLine::ForCurrentProcess();
+ CommandLine* cl = CommandLine::ForCurrentProcess();
if (cl->HasSwitch(switches::kPasswordFileForTest)) {
// Read GAIA credentials from a local password file if specified via the
// "--password-file-for-test" command line switch. Note: The password file
@@ -55,6 +55,13 @@ void LiveSyncTest::SetUp() {
<< "without specifying --" << switches::kSyncPasswordForTest;
}
+ // TODO(rsimha): Until we implement a fake Tango server against which tests
+ // can run, we need to set the --sync-notification-method to "transitional".
+ if (!cl->HasSwitch(switches::kSyncNotificationMethod)) {
+ cl->AppendSwitchWithValue(switches::kSyncNotificationMethod,
+ "transitional");
+ }
+
// Unless a sync server was explicitly provided, run a test one locally.
// TODO(ncarter): It might be better to allow the user to specify a choice
// of sync server "providers" -- a script that could locate (or allocate)