From b7e506341f94f6e098818c2fa0e127467c55046b Mon Sep 17 00:00:00 2001
From: Brian O'Connor <bocon13@gmail.com>
Date: Tue, 10 Sep 2013 14:45:19 -0700
Subject: [PATCH] cleaned up and commented test_controlnet.py

---
 examples/test/test_controlnet.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/examples/test/test_controlnet.py b/examples/test/test_controlnet.py
index 73ffa3e4..91631f29 100755
--- a/examples/test/test_controlnet.py
+++ b/examples/test/test_controlnet.py
@@ -1,22 +1,18 @@
 #!/usr/bin/env python
 
-"""TEST"""
+"""
+Test for controlnet.py
+"""
 
 import unittest
 import pexpect
-from mininet.log import setLogLevel
-#from mininet.net import Mininet
-#from mininet.node import CPULimitedHost
-#from mininet.link import TCLink
-
-#from mininet.examples.simpleperf import SingleSwitchTopo
 
 class testControlNet( unittest.TestCase ):
-    "Test ping with single switch topology (common code)."
 
     prompt = 'mininet>'
 
     def testPingall( self ):
+        "Simple pingall test that verifies 0% packet drop in data network"
         p = pexpect.spawn( 'python -m mininet.examples.controlnet' )
         p.expect( self.prompt )
         p.sendline( 'pingall' )
@@ -28,6 +24,7 @@ def testPingall( self ):
         p.wait()
 
     def testFailover( self ):
+        "Kill controllers and verity that switch, s1, fails over properly"
         count = 1
         p = pexpect.spawn( 'python -m mininet.examples.controlnet' )
         p.expect( self.prompt )
@@ -47,5 +44,4 @@ def testFailover( self ):
         p.wait()
 
 if __name__ == '__main__':
-    setLogLevel( 'warning' )
     unittest.main()
-- 
GitLab