updated to work w/ mininet 2.2.0

Author: Joshua Reich

mininet.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
 
-sudo ~/pyretic/mininet/mn -c
-sudo ~/pyretic/mininet/mn --custom $HOME/pyretic/mininet/extra-topos.py --controller remote --mac $@
+VER=`mn --version`
+
+if [[ "$VER" < "2.2.0" ]] 
+then
+    MN="$HOME/pyretic/mininet/mn"
+else
+    MN=mn
+fi
+sudo $MN -c
+sudo $MN --custom $HOME/pyretic/mininet/extra-topos.py --controller remote --mac $@

pyretic/tests/utils.py

@@ -52,14 +52,14 @@ def _start_controller(self):
         self.out = file(out_path, 'w')
         self.err = file(err_path, 'w')
         self.process = subprocess.Popen(cmd, stdout=self.out, stderr=self.err) 
-        time.sleep(2)
+        #time.sleep(2)
         return [out_name, err_name]
 
     def _stop_controller(self):
         self.process.send_signal(signal.SIGINT)
         self.out.close()
         self.err.close()
-        time.sleep(2)
+        #time.sleep(2)
 
     def _run_mininet(self):
         cmd = shlex.split('sudo %s' % self.test_file)