Enable CNS to serve files from different port.

media/tools/constrained_network_server/cns_test.py

 #!/usr/bin/env python
 # 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.
 
 """Tests for Constrained Network Server."""
 import os
 import signal
 import subprocess
 import tempfile
@@ skipping 18 matching lines @@
     # Mock out time.time() to accelerate port expiration testing.
     self._old_time = time.time
     self._current_time = 0
     time.time = lambda: self._current_time
 
     # TODO(dalecurtis): Mock out actual calls to shadi's port setup.
     self._pa = cns.PortAllocator(cns._DEFAULT_CNS_PORT_RANGE, self._EXPIRY_TIME)
     self._MockTrafficControl()
 
   def tearDown(self):
-    self._pa.Cleanup(_INTERFACE, all_ports=True)

[DaleCurtis, 2012/08/07 23:53:57]

Is this no longer necessary / incorrect?

[shadi, 2012/08/08 22:55:49]

Not necessary, Cleanup() does a clean up on allocated ports which already have
the interface value stored in a map.

+    self._pa.Cleanup(all_ports=True)
     # Ensure ports are cleaned properly.
     self.assertEquals(self._pa._ports, {})
     time.time = self._old_time
     self._RestoreTrafficControl()
 
   def _MockTrafficControl(self):
     self.old_CreateConstrainedPort = traffic_control.CreateConstrainedPort
     self.old_DeleteConstrainedPort = traffic_control.DeleteConstrainedPort
     self.old_TearDown = traffic_control.TearDown
 
@@ skipping 60 matching lines @@
     self._current_time += self._EXPIRY_TIME
 
     # Send second Get() which would normally cause ports to expire. Ensure that
     # the ports did not expire.
     self.assertEquals(self._pa.Get('test2'), cns._DEFAULT_CNS_PORT_RANGE[0] + 1)
     self.assertEquals(set(self._pa._ports.keys()), set([
         cns._DEFAULT_CNS_PORT_RANGE[0], cns._DEFAULT_CNS_PORT_RANGE[0] + 1]))
 
 
 class ConstrainedNetworkServerTest(unittest.TestCase):
-  """End to end tests for ConstrainedNetworkServer system."""
+  """End to end tests for ConstrainedNetworkServer system.
+
+  These tests require root access and run the cherrypy server along with
+  tc/iptables commands.
+  """
 
   # Amount of time to wait for the CNS to start up.
   _SERVER_START_SLEEP_SECS = 1
 
   # Sample data used to verify file serving.
   _TEST_DATA = 'The quick brown fox jumps over the lazy dog'
 
   # Server information.
   _SERVER_URL = ('http://127.0.0.1:%d/ServeConstrained?' %
                  cns._DEFAULT_SERVING_PORT)
@@ skipping 54 matching lines @@
     url = '%s&latency=%d' % (base_url, self._LATENCY_TEST_SECS * 1000)
     f = urllib2.urlopen(url)
 
     # Verify file data is served correctly.
     self.assertEqual(self._TEST_DATA, f.read())
 
     # Verify the request took longer than the requested latency.
     self.assertTrue(time.time() - now > self._LATENCY_TEST_SECS)
 
     # Verify the server properly redirected the URL.
-    self.assertEquals(f.geturl(), base_url.replace(
-        str(cns._DEFAULT_SERVING_PORT), str(cns._DEFAULT_CNS_PORT_RANGE[0])))
+    self.assertTrue(f.geturl().startswith(base_url.replace(
+        str(cns._DEFAULT_SERVING_PORT), str(cns._DEFAULT_CNS_PORT_RANGE[0]))))
 
 
 if __name__ == '__main__':
   unittest.main()