commit 95887fdc6150987e1ed9d64256ab8abc50a16165
author Jaineel <jaineelm@google.com> Wed Oct 16 16:19:01 2019 -0700
committer Jaineel Mehta <jaineelm@google.com> Thu Oct 17 18:28:05 2019 +0000
tree 5954603bf6751ca664979561fe804c200e8d41d7
parent 68e7a7e739feb6650020fb0e9a50201421f489f1

MAC address verification in pcap fixing

1. Device needs reboot before querying for factory mac
2. all verify mac is found/not found in pcap tests never fails,
   fixing that with proper return statements. As a result, bugreport
   will now get collected

Test: Yes, locally
Bug: 141255121
Bug: 142821661
Change-Id: I6d359d9781ebc9105dfaeb59e005de19ae3c97ab

acts/tests/google/wifi/WifiMacRandomizationTest.py

diff --git a/acts/tests/google/wifi/WifiMacRandomizationTest.py b/acts/tests/google/wifi/WifiMacRandomizationTest.py
index 4485220..47554bf 100644
--- a/acts/tests/google/wifi/WifiMacRandomizationTest.py
+++ b/acts/tests/google/wifi/WifiMacRandomizationTest.py
@@ -241,8 +241,9 @@
         for pkt in packets:
             self.log.debug("Packet Summary = %s" % pkt.summary())
             if mac in pkt.summary():
-                raise signals.TestFailure("Caught Factory MAC in packet sniffer."
-                                          "Packet = %s" % pkt.show())
+                raise signals.TestFailure("Caught Factory MAC in packet sniffer"
+                                          "Packet = %s Device = %s"
+                                           % (pkt.show(), self.dut))
 
     def verify_mac_is_found_in_pcap(self, mac, packets):
         for pkt in packets:
@@ -250,7 +251,7 @@
             if mac in pkt.summary():
                 return
         raise signals.TestFailure("Did not find MAC = %s in packet sniffer."
-                                  % mac)
+                                  "for device %s" % (mac, self.dut))
 
     def get_sta_mac_address(self):
         """Gets the current MAC address being used for client mode."""
@@ -283,7 +284,8 @@
         time.sleep(SHORT_TIMEOUT)
         wutils.stop_pcap(self.packet_capture, self.pcap_procs, False)
         packets = rdpcap(pcap_fname)
-        self.verify_mac_is_found_in_pcap(self.sta_factory_mac, packets)
+        self.verify_mac_is_found_in_pcap(self.dut, self.sta_factory_mac,
+                                         packets)
 
     @test_tracker_info(uuid="d9e64202-02d5-421a-967c-42e45f1f7f91")
     def test_mac_randomization_wpapsk(self):