tests: Use social channel scan to speed up tests

The discovery and group formation test cases do not need to run the full
scan as the first step, so get rid of it to make the tests complete more
quickly.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

tests/hwsim/test_p2p_discovery.py

@@ -14,8 +14,8 @@ def test_discovery(dev):
     addr0 = dev[0].p2p_dev_addr()
     addr1 = dev[1].p2p_dev_addr()
     logger.info("Start device discovery")
-    dev[0].p2p_find()
-    dev[1].p2p_find()
+    dev[0].p2p_find(social=True)
+    dev[1].p2p_find(social=True)
     ev0 = dev[0].wait_event(["P2P-DEVICE-FOUND"], timeout=15)
     if ev0 is None:
         raise Exception("Device discovery timed out")

tests/hwsim/test_p2p_grpform.py

@@ -84,8 +84,8 @@ def go_neg_init_pbc(i_dev, r_dev, i_intent, res):
     res.put(i_res)
 
 def go_neg_pbc(i_dev, r_dev, i_intent=None, r_intent=None):
-    r_dev.p2p_find()
-    i_dev.p2p_find()
+    r_dev.p2p_find(social=True)
+    i_dev.p2p_find(social=True)
     logger.info("Start GO negotiation " + i_dev.ifname + " -> " + r_dev.ifname)
     r_dev.dump_monitor()
     res = Queue.Queue()