add autosecuring to tests

tests/automated/helpers.py

@@ -3,6 +3,7 @@ import sys
 import time
 import random
 import subprocess
+import requests
 from panda import Panda
 from nose.tools import timed, assert_equal, assert_less, assert_greater
 
@@ -30,22 +31,32 @@ def _connect_wifi(dongle_id, pw):
 
   print("WIFI: connecting to %s" % ssid)
 
-  if sys.platform == "darwin":
-    os.system("networksetup -setairportnetwork en0 %s %s" % (ssid, pw))
-  else:
-    cnt = 0
-    MAX_TRIES = 10
-    while cnt < MAX_TRIES:
-      print "WIFI: scanning %d" % cnt
-      os.system("nmcli device wifi rescan")
-      wifi_scan = filter(lambda x: ssid in x, subprocess.check_output(["nmcli","dev", "wifi", "list"]).split("\n"))
-      if len(wifi_scan) != 0:
+  while 1:
+    if sys.platform == "darwin":
+      os.system("networksetup -setairportnetwork en0 %s %s" % (ssid, pw))
+    else:
+      cnt = 0
+      MAX_TRIES = 10
+      while cnt < MAX_TRIES:
+        print "WIFI: scanning %d" % cnt
+        os.system("nmcli device wifi rescan")
+        wifi_scan = filter(lambda x: ssid in x, subprocess.check_output(["nmcli","dev", "wifi", "list"]).split("\n"))
+        if len(wifi_scan) != 0:
+          break
+        time.sleep(0.1)
+        # MAX_TRIES tries, ~10 seconds max
+        cnt += 1
+      assert cnt < MAX_TRIES
+      if "-pair" in wifi_scan[0]:
+        os.system("nmcli d wifi connect %s-pair" % (ssid))
+        print "connecting to insecure network to secure"
+        try:
+          r = requests.get("http://192.168.0.10/secure", timeout=0.01)
+        except requests.exceptions.Timeout:
+          pass
+      else:
+        os.system("nmcli d wifi connect %s password %s" % (ssid, pw))
         break
-      time.sleep(0.1)
-      # MAX_TRIES tries, ~10 seconds max
-      cnt += 1
-    assert cnt < MAX_TRIES
-    os.system("nmcli d wifi connect %s password %s" % (ssid, pw))
   
   # TODO: confirm that it's connected to the right panda