[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..a1b7fb4fbe710d0ee8e87ff6758c3fd646669b6c 100644
--- a/net/test/base_test_server.h
+++ b/net/test/base_test_server.h
@@ -167,16 +167,23 @@ class BaseTestServer {
       const std::vector<StringPair>& text_to_replace,
       std::string* replacement_path);
 
+  // Sets |port| as the actual port used by Python based test server.
+  void SetPort(uint16 port);
+
+  // Sets |xmpp_port| as the actual xmpp_port used by Python based test server.
+  void SetXmppPort(uint16 xmpp_port);

[Paweł Hajdan Jr., 2012/05/21 08:36:46]

Please stop this. I asked you people to extract the XMPP bits to a separate
class, both here and in Python code. How about doing that now?

[Raghu Simha, 2012/05/23 02:25:11]

Your language here puzzles me. Whom do you mean by "you people" and what are you
suggesting I stop doing? This is the first time I've written a CL that touches
this file. If you wanted to be helpful and offer constructive feedback, a link
to a previous CL would have helped. Your accusatory tone seems somewhat
childish. My 2 cents, FWIW.
I had to spend some time digging into the history of this file.

The "here" part is easy. I've separated out the python sync launching code into
a subclass called LocalSyncTestServer. There is no more sync specific stuff in
base_test_server.cc.

The "python" part is harder -- significantly harder. We use testserver.py on
several platforms, and separating things here will cause a whole lot of breakage
all over the place. I've made a note of this in the description and linked to
the bug for this, and plan on dealing with it when I work on extracting the sync
python server later this quarter. 

+
  protected:
   virtual ~BaseTestServer();
   Type type() const { return type_; }
 
   // Gets port currently assigned to host_port_pair_ without checking
   // whether it's available (server started) or not.
-  uint16 GetPort();
+  uint16 GetPort() const;
 
-  // Sets |port| as the actual port used by Python based test server.
-  void SetPort(uint16 port);
+  // Gets port currently assigned to xmpp_port_ without checking
+  // whether it's available (server started) or not.
+  uint16 GetXmppPort() const;
 
   // Set up internal status when the server is started.
   bool SetupWhenServerStarted() WARN_UNUSED_RESULT;
@@ -212,6 +219,9 @@ class BaseTestServer {
   // Address the test server listens on.
   HostPortPair host_port_pair_;
 
+  // Port on which the Sync XMPP server listens.
+  uint16 xmpp_port_;
+
   // Holds the data sent from the server (e.g., port number).
   scoped_ptr<base::DictionaryValue> server_data_;