Constrained Network test does not fail fast under fatal conditions.

media/tools/constrained_network_server/traffic_control_unittest.py

Index: media/tools/constrained_network_server/traffic_control_unittest.py
diff --git a/media/tools/constrained_network_server/traffic_control_unittest.py b/media/tools/constrained_network_server/traffic_control_unittest.py
index 29580b4df325ddd9a7c40b107b5467d2343d5de1..62db44e4bfc2f2949d0e567424c82fa6dae9c318 100644
--- a/media/tools/constrained_network_server/traffic_control_unittest.py
+++ b/media/tools/constrained_network_server/traffic_control_unittest.py
@@ -43,17 +43,17 @@ class TrafficControlUnitTests(unittest.TestCase):
     }
     traffic_control.CreateConstrainedPort(config)
     expected = [
-        'tc qdisc add dev fakeeth root handle 1: htb',
-        'tc class add dev fakeeth parent 1: classid 1:3039 htb rate 256kbps '
-        'ceil 256kbps',
-        'tc qdisc add dev fakeeth parent 1:3039 handle 3039:0 netem loss 2% '
-        'delay 100ms',
-        'tc filter add dev fakeeth protocol ip parent 1: prio 1 u32 match ip '
-        'sport 12345 0xffff flowid 1:3039',
-        'iptables -t nat -A PREROUTING -i fakeeth -p tcp --dport 12345 -j '
+        'sudo tc qdisc add dev fakeeth root handle 1: htb',
+        'sudo tc class add dev fakeeth parent 1: classid 1:3039 htb rate '
+        '256kbit ceil 256kbit',
+        'sudo tc qdisc add dev fakeeth parent 1:3039 handle 3039:0 netem loss '
+        '2% delay 100ms',
+        'sudo tc filter add dev fakeeth protocol ip parent 1: prio 1 u32 match '
+        'ip sport 12345 0xffff flowid 1:3039',
+        'sudo iptables -t nat -A PREROUTING -i fakeeth -p tcp --dport 12345 -j '
         'REDIRECT --to-port 8888',
-        'iptables -t nat -A OUTPUT -p tcp --dport 12345 -j REDIRECT --to-port '
-        '8888'
+        'sudo iptables -t nat -A OUTPUT -p tcp --dport 12345 -j REDIRECT '
+        '--to-port 8888'
     ]
     self.assertEqual(expected, self.commands)
 
@@ -66,17 +66,17 @@ class TrafficControlUnitTests(unittest.TestCase):
     }
     traffic_control.CreateConstrainedPort(config)
     expected = [
-        'tc qdisc add dev fakeeth root handle 1: htb',
-        'tc class add dev fakeeth parent 1: classid 1:3039 htb rate %dkbps '
-        'ceil %dkbps' % (traffic_control._DEFAULT_MAX_BANDWIDTH_KBPS,
-                         traffic_control._DEFAULT_MAX_BANDWIDTH_KBPS),
-        'tc qdisc add dev fakeeth parent 1:3039 handle 3039:0 netem',
-        'tc filter add dev fakeeth protocol ip parent 1: prio 1 u32 match ip '
-        'sport 12345 0xffff flowid 1:3039',
-        'iptables -t nat -A PREROUTING -i fakeeth -p tcp --dport 12345 -j '
+        'sudo tc qdisc add dev fakeeth root handle 1: htb',
+        'sudo tc class add dev fakeeth parent 1: classid 1:3039 htb rate '
+        '%dkbit ceil %dkbit' % (traffic_control._DEFAULT_MAX_BANDWIDTH_KBIT,
+                                traffic_control._DEFAULT_MAX_BANDWIDTH_KBIT),
+        'sudo tc qdisc add dev fakeeth parent 1:3039 handle 3039:0 netem',
+        'sudo tc filter add dev fakeeth protocol ip parent 1: prio 1 u32 '
+        'match ip sport 12345 0xffff flowid 1:3039',
+        'sudo iptables -t nat -A PREROUTING -i fakeeth -p tcp --dport 12345 -j '
         'REDIRECT --to-port 8888',
-        'iptables -t nat -A OUTPUT -p tcp --dport 12345 -j REDIRECT --to-port '
-        '8888'
+        'sudo iptables -t nat -A OUTPUT -p tcp --dport 12345 -j REDIRECT '
+        '--to-port 8888'
     ]
     self.assertEqual(expected, self.commands)
 
@@ -93,13 +93,13 @@ class TrafficControlUnitTests(unittest.TestCase):
     try:
       traffic_control.DeleteConstrainedPort(config)
       expected = [
-          'tc filter del dev fakeeth protocol ip parent 1:0 handle 800::800 '
-          'prio 1 u32',
-          'tc class del dev fakeeth parent 1: classid 1:3039 htb rate 256kbps '
-          'ceil 256kbps',
-          'iptables -t nat -D PREROUTING -i fakeeth -p tcp --dport 12345 -j '
-          'REDIRECT --to-port 8888',
-          'iptables -t nat -D OUTPUT -p tcp --dport 12345 -j REDIRECT '
+          'sudo tc filter del dev fakeeth protocol ip parent 1:0 handle '
+          '800::800 prio 1 u32',
+          'sudo tc class del dev fakeeth parent 1: classid 1:3039 htb rate '
+          '256kbit ceil 256kbit',
+          'sudo iptables -t nat -D PREROUTING -i fakeeth -p tcp --dport 12345 '
+          '-j REDIRECT --to-port 8888',
+          'sudo iptables -t nat -D OUTPUT -p tcp --dport 12345 -j REDIRECT '
           '--to-port 8888']
       self.assertEqual(expected, self.commands)
     finally:
@@ -110,8 +110,8 @@ class TrafficControlUnitTests(unittest.TestCase):
 
     traffic_control.TearDown(config)
     expected = [
-        'tc qdisc del dev fakeeth root',
-        'iptables -t nat -F'
+        'sudo tc qdisc del dev fakeeth root',
+        'sudo iptables -t nat -F'
     ]
     self.assertEqual(expected, self.commands)
 
@@ -119,12 +119,13 @@ class TrafficControlUnitTests(unittest.TestCase):
     # Check seach for handle ID command.
     self.assertRaises(traffic_control.TrafficControlError,
                       traffic_control._GetFilterHandleId, 'fakeeth', 1)
-    self.assertEquals(self.commands, ['tc filter list dev fakeeth parent 1:'])
+    self.assertEquals(self.commands, ['sudo tc filter list dev fakeeth parent '
+                                      '1:'])
 
     # Check with handle ID available.
     traffic_control._Exec = (lambda command, msg:
-      'filter parent 1: protocol ip'' pref 1 u32 fh 800::800 order 2048 key ht '
-      '800 bkt 0 flowid 1:1')
+      'filter protocol ip pref 1 u32 fh 800::800 order 2048 key ht 800 bkt 0 '
+      'flowid 1:1 match c3500000/ffff0000 at 20')

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

Can you explain this change? It's way different than the previous version :)

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

I updated it with exact output example.

I also added a test for a case pointed out previously by Ami.
On 2012/01/06 23:19:42, DaleCurtis wrote:

     output = traffic_control._GetFilterHandleId('fakeeth', 1)
     self.assertEqual(output, '800::800')