Constrained Network test does not fail fast under fatal conditions.

media/tools/constrained_network_server/traffic_control_test.py

 #!/usr/bin/env python
 
 # Copyright (c) 2011 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.
 
 """End-to-end tests for traffic control library."""
 import os
 import re
 import sys
@@ skipping 57 matching lines @@
     self.assertTrue(root_detail in output)
 
   def testConfigureClassAdd(self):
     """Checks adding and deleting a class to the root qdisc."""
     config = {
         'interface': self._INTERFACE,
         'port': 12345,
         'server_port': 33333,
         'bandwidth': 2000
     }
-    # Convert Kbps to Kbit.
-    rate = config['bandwidth'] * 8
     class_detail = ('class htb 1:%x root prio 0 rate %dKbit ceil %dKbit' %

[DaleCurtis, 2012/01/06 23:19:42]

s/Kbit/kbit/ ?

[shadi, 2012/01/07 04:56:19]

They seem both to work.
On 2012/01/06 23:19:42, DaleCurtis wrote:

-                    (config['port'], rate, rate))
+                    (config['port'], config['bandwidth'], config['bandwidth']))
 
     # Add root qdisc.
     traffic_control._AddRootQdisc(config['interface'])
 
     # Assert class does not exist prior to adding it.
     command = ['tc', 'class', 'ls', 'dev', config['interface']]
     output = traffic_control._Exec(command)
     self.assertFalse(class_detail in output)
 
     # Add class to root.
@@ skipping 74 matching lines @@
     # Delete the filter.
     # The output of tc filter list is not None because tc adds default filters.
     traffic_control._DeleteFilter(config['interface'], config['port'])
     self.assertRaises(traffic_control.TrafficControlError,
                       traffic_control._GetFilterHandleId, config['interface'],
                       config['port'])
 
 
 if __name__ == '__main__':
   unittest.main()