diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 05:37:51 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 05:37:51 +0000 |
| commit | 0a5893a88936f38cbf8646ed7a06f1c19a289341 (patch) | |
| tree | 9050702c471c07e9be64d46d69d00589ab8dae3f /net/net.gyp | |
| parent | 651fac9f29ca8450e6879b26faf0b1146164b24a (diff) | |
| download | chromium_src-0a5893a88936f38cbf8646ed7a06f1c19a289341.zip chromium_src-0a5893a88936f38cbf8646ed7a06f1c19a289341.tar.gz chromium_src-0a5893a88936f38cbf8646ed7a06f1c19a289341.tar.bz2 | |
[Third time landing] Python implementation of sync server, for testing.
Implement the server side of chromium sync inside of testserver.py. The implementation supports at most one account (and ignores authentication credentials), but is otherwise reasonably full featured.
Make the sync_integration_tests run by default against the test server. An externally-provided --sync-url will give the old behavior.
Protocol buffers stuff: The test sync server requires Python generated code for .proto files. I've put generated code, as well as the python protocol buffers runtime library, in the output directory + "/python" (e.g, on windows, src/chrome/Debug/python/google/protobuf).
Flakiness fix: In the InProcessBrowserTest framework, improve the mechanism for tests that want to manually set up a user data directory. The new way ensures that the user data directory is always wiped; tests can't accidentally forget to do this anymore.
Flakiness fix: Make testserver try to /kill any old instance that might be hogging the port. Very useful if a test failure leaves a server running. Tested this against all combos of protocols, and it seems to work.
Flakiness fix: Port sync_integration_tests to the out-of-process test runner.
Flakiness fix: For IN_PROC_BROWSER_TESTS, don't run the test body if the setup triggered a fatal (ASSERT_) failure.
BUG=20905,40980
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=44708
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=45916
Review URL: http://codereview.chromium.org/1622012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index d659731..76c9f4a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -832,7 +832,9 @@ 'dependencies': [ 'net', '../base/base.gyp:base', + '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', '../testing/gtest.gyp:gtest', + '../third_party/protobuf2/protobuf.gyp:py_proto', ], 'sources': [ 'base/cert_test_util.cc', |