From 20d241c33c3e6c1be8ab4023dfa46d6a4fdb4766 Mon Sep 17 00:00:00 2001 From: "nick@chromium.org" Date: Thu, 15 Apr 2010 22:28:18 +0000 Subject: Revert 44708 - 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 externallyprovided syncurl 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). This might be a bad place, or a bad name open to suggestions. The main thing is that there will be runtime dependencies on it, so it didn't seem right to put it in obj/. 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 outofprocess 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 Review URL: http://codereview.chromium.org/1622012 TBR=nick@chromium.org Review URL: http://codereview.chromium.org/1633015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44714 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_tests.gypi | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'chrome/chrome_tests.gypi') diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 647a8d0..94070dfe 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -496,13 +496,13 @@ 'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC', 'dependencies': [ 'browser', - 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'chrome', 'chrome_resources', 'chrome_strings', 'common', 'debugger', 'renderer', + 'sync_proto', 'test_support_unit', 'utility', '../app/app.gyp:app_base', @@ -1700,7 +1700,6 @@ '_USE_32BIT_TIME_T', ], 'dependencies': [ - 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'common', 'debugger', '../skia/skia.gyp:skia', @@ -1708,6 +1707,7 @@ '../testing/gtest.gyp:gtest', '../third_party/libjingle/libjingle.gyp:libjingle', 'syncapi', + 'sync_proto', 'test_support_unit', ], 'conditions': [ @@ -1758,14 +1758,15 @@ 'type': 'executable', 'dependencies': [ 'browser', - 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'chrome', 'chrome_resources', 'common', 'debugger', 'renderer', + 'chrome_resources', 'chrome_strings', - 'test_support_common', + 'sync_proto', + 'test_support_unit', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', @@ -1787,9 +1788,6 @@ 'app/chrome_dll_resource.h', 'test/in_process_browser_test.cc', 'test/in_process_browser_test.h', - 'test/test_launcher/out_of_proc_test_runner.cc', - 'test/test_launcher/test_runner.cc', - 'test/test_launcher/test_runner.h', 'test/live_sync/bookmark_model_verifier.cc', 'test/live_sync/bookmark_model_verifier.h', 'test/live_sync/live_sync_test.cc', -- cgit v1.1