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

net/test/base_test_server.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_TEST_BASE_TEST_SERVER_H_
 #define NET_TEST_BASE_TEST_SERVER_H_
 #pragma once
 
 #include <string>
 #include <utility>
@@ skipping 149 matching lines @@
 
   GURL GetURLWithUserAndPassword(const std::string& path,
                                  const std::string& user,
                                  const std::string& password) const;
 
   static bool GetFilePathWithReplacements(
       const std::string& original_path,
       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;
 
   // Clean up internal status when starting to stop server.
   void CleanUpWhenStoppingServer();
 
   // Set path of test resources.
   void SetResourcePath(const FilePath& document_root,
                        const FilePath& certificates_dir);
@@ skipping 15 matching lines @@
 
   // Document root of the test server.
   FilePath document_root_;
 
   // Directory that contains the SSL certificates.
   FilePath certificates_dir_;
 
   // 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_;
 
   // If |type_| is TYPE_HTTPS, the TLS settings to use for the test server.
   HTTPSOptions https_options_;
 
   Type type_;
 
   // Has the server been started?
   bool started_;
 
   // Enables logging of the server to the console.
   bool log_to_console_;
 
   scoped_ptr<ScopedPortException> allowed_port_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_BASE_TEST_SERVER_H_