| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 | 2 | 
| 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be | 
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. | 
| 6 | 6 | 
| 7 """End-to-end tests for traffic control library.""" | 7 """End-to-end tests for traffic control library.""" | 
| 8 import os | 8 import os | 
| 9 import re | 9 import re | 
| 10 import sys | 10 import sys | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68     self.assertTrue(root_detail in output) | 68     self.assertTrue(root_detail in output) | 
| 69 | 69 | 
| 70   def testConfigureClassAdd(self): | 70   def testConfigureClassAdd(self): | 
| 71     """Checks adding and deleting a class to the root qdisc.""" | 71     """Checks adding and deleting a class to the root qdisc.""" | 
| 72     config = { | 72     config = { | 
| 73         'interface': self._INTERFACE, | 73         'interface': self._INTERFACE, | 
| 74         'port': 12345, | 74         'port': 12345, | 
| 75         'server_port': 33333, | 75         'server_port': 33333, | 
| 76         'bandwidth': 2000 | 76         'bandwidth': 2000 | 
| 77     } | 77     } | 
| 78     # Convert Kbps to Kbit. | 78     class_detail = ('class htb 1:%x root prio 0 rate %dkbit ceil %dkbit' % | 
| 79     rate = config['bandwidth'] * 8 | 79                     (config['port'], config['bandwidth'], config['bandwidth'])) | 
| 80     class_detail = ('class htb 1:%x root prio 0 rate %dKbit ceil %dKbit' % |  | 
| 81                     (config['port'], rate, rate)) |  | 
| 82 | 80 | 
| 83     # Add root qdisc. | 81     # Add root qdisc. | 
| 84     traffic_control._AddRootQdisc(config['interface']) | 82     traffic_control._AddRootQdisc(config['interface']) | 
| 85 | 83 | 
| 86     # Assert class does not exist prior to adding it. | 84     # Assert class does not exist prior to adding it. | 
| 87     command = ['tc', 'class', 'ls', 'dev', config['interface']] | 85     command = ['tc', 'class', 'ls', 'dev', config['interface']] | 
| 88     output = traffic_control._Exec(command) | 86     output = traffic_control._Exec(command) | 
| 89     self.assertFalse(class_detail in output) | 87     self.assertFalse(class_detail in output) | 
| 90 | 88 | 
| 91     # Add class to root. | 89     # Add class to root. | 
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 166     # Delete the filter. | 164     # Delete the filter. | 
| 167     # The output of tc filter list is not None because tc adds default filters. | 165     # The output of tc filter list is not None because tc adds default filters. | 
| 168     traffic_control._DeleteFilter(config['interface'], config['port']) | 166     traffic_control._DeleteFilter(config['interface'], config['port']) | 
| 169     self.assertRaises(traffic_control.TrafficControlError, | 167     self.assertRaises(traffic_control.TrafficControlError, | 
| 170                       traffic_control._GetFilterHandleId, config['interface'], | 168                       traffic_control._GetFilterHandleId, config['interface'], | 
| 171                       config['port']) | 169                       config['port']) | 
| 172 | 170 | 
| 173 | 171 | 
| 174 if __name__ == '__main__': | 172 if __name__ == '__main__': | 
| 175   unittest.main() | 173   unittest.main() | 
| OLD | NEW | 
|---|