Commit 2c2b01d0 authored by rsimha@chromium.org's avatar rsimha@chromium.org

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
parent 0a8b7327
...@@ -22,7 +22,7 @@ void LiveSyncTest::SetUp() { ...@@ -22,7 +22,7 @@ void LiveSyncTest::SetUp() {
// At this point, the browser hasn't been launched, and no services are // At this point, the browser hasn't been launched, and no services are
// available. But we can verify our command line parameters and fail // available. But we can verify our command line parameters and fail
// early. // early.
const CommandLine* cl = CommandLine::ForCurrentProcess(); CommandLine* cl = CommandLine::ForCurrentProcess();
if (cl->HasSwitch(switches::kPasswordFileForTest)) { if (cl->HasSwitch(switches::kPasswordFileForTest)) {
// Read GAIA credentials from a local password file if specified via the // Read GAIA credentials from a local password file if specified via the
// "--password-file-for-test" command line switch. Note: The password file // "--password-file-for-test" command line switch. Note: The password file
...@@ -55,6 +55,13 @@ void LiveSyncTest::SetUp() { ...@@ -55,6 +55,13 @@ void LiveSyncTest::SetUp() {
<< "without specifying --" << switches::kSyncPasswordForTest; << "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. // 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 // 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) // of sync server "providers" -- a script that could locate (or allocate)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment