[sync] Add --port and --xmpp-port parameters to run_testserver.cc

net/test/base_test_server.h

Index: net/test/base_test_server.h
diff --git a/net/test/base_test_server.h b/net/test/base_test_server.h
index f7d5654baf223876937741b1ff486e66f1d8a8c3..e31747b3886c29d6a22eb6a158e576d264de35e7 100644
--- a/net/test/base_test_server.h
+++ b/net/test/base_test_server.h
@@ -182,7 +182,7 @@ class BaseTestServer {
   bool SetupWhenServerStarted() WARN_UNUSED_RESULT;
 
   // Clean up internal status when starting to stop server.
-  void CleanUpWhenStoppingServer();
+  virtual void CleanUpWhenStoppingServer();

[Paweł Hajdan Jr., 2012/05/23 06:53:02]

Please find a way to avoid making this virtual. Once we allow protected virtual
methods the contract between classes becomes more complex and fragile.

Would preventing the server from being started again after it's stopped break
anything in the codebase? If not, we could do that, and remove
CleanUpWhenStoppingServer almost completely, at least zeroing-out int member
variables.

[Raghu Simha, 2012/05/23 19:54:28]

Done. 

The sync server is only started once in every place it is used, so
CleanUpWhenStoppingServer is moot when it comes to sync. I've undone this
change.

Changes to how CleanUpWhenStoppingServer works (including its removal) is out of
the scope of this patch.

 
   // Set path of test resources.
   void SetResourcePath(const FilePath& document_root,
@@ -194,7 +194,7 @@ class BaseTestServer {
 
   // Generates a DictionaryValue with the arguments for launching the external
   // Python test server.
-  bool GenerateArguments(base::DictionaryValue* arguments) const;
+  virtual bool GenerateArguments(base::DictionaryValue* arguments) const;

[Paweł Hajdan Jr., 2012/05/23 06:53:02]

Do not override this. See how LocalTestServer handles that.

[Raghu Simha, 2012/05/23 19:54:28]

Done.

There are two sets of arguments being strung together here -- the ones passed to
python.exe and the ones passed to testserver.py.
BaseTestServer::GenerateArguments takes care of the args passed to testserver.py
while LocalTestServer::AddCommandLineArguments takes care of the ones passed to
python.exe and then calls AppendArg for the stuff returned by
BaseTestServer::GenerateArguments. (AppendSwitchASCII won't work because the
args will then get passed to python.exe, not testserver.py)

The only way to avoid making BaseTestServer::GenerateArguments virtual is to
make LocalTestServer::AddCommandLineArguments public virtual and call it from
the override, LocalSyncTestServer::AddCommandLineArguments.

 
  private:
   void Init(const std::string& host);