commit c023270aa6dbb5c05c39050045eb95d3c61e4867
author Bindu Mahadev <bmahadev@google.com> Thu Apr 04 15:23:28 2019 -0700
committer Oscar Shu <xshu@google.com> Tue Apr 23 20:32:35 2019 +0000
tree 1863693ab30777c7b1a6db036e6cc853bbf9e596
parent a3c8762ec24cf4edc09b7c450f5ed49b06aa28cc

[Tests]Update packet capturing for MacRandomization test.

Bug: 129076522
Test: Local
Change-Id: I634b1a1d4c9872725944769d744e5f6bd61b01c9
Merged-In: I634b1a1d4c9872725944769d744e5f6bd61b01c9
(cherry picked from commit 3fe60953506618736506731453d8b71c2b76968a)

acts/tests/google/wifi/WifiMacRandomizationTest.py

diff --git a/acts/tests/google/wifi/WifiMacRandomizationTest.py b/acts/tests/google/wifi/WifiMacRandomizationTest.py
index fca1df6..d4bdd8a 100755
--- a/acts/tests/google/wifi/WifiMacRandomizationTest.py
+++ b/acts/tests/google/wifi/WifiMacRandomizationTest.py
@@ -94,9 +94,6 @@
             ad.droid.wakeLockAcquireBright()
             ad.droid.wakeUpNow()
             wutils.wifi_toggle_state(ad, True)
-        if hasattr(self, 'packet_capture'):
-            self.pcap_procs = wutils.start_pcap(
-                self.packet_capture, 'dual', self.log_path, self.test_name)
 
     def teardown_test(self):
         for ad in self.android_devices:
@@ -105,13 +102,7 @@
         wutils.reset_wifi(self.dut)
         wutils.reset_wifi(self.dut_client)
 
-    def on_pass(self, test_name, begin_time):
-        if hasattr(self, 'packet_capture'):
-            wutils.stop_pcap(self.packet_capture, self.pcap_procs, True)
-
     def on_fail(self, test_name, begin_time):
-        if hasattr(self, 'packet_capture'):
-            wutils.stop_pcap(self.packet_capture, self.pcap_procs, False)
         self.dut.cat_adb_log(test_name, begin_time)
         self.dut.take_bug_report(test_name, begin_time)
 
@@ -453,13 +444,13 @@
         """
         if hasattr(self, 'packet_capture'):
             self.pcap_procs = wutils.start_pcap(
-                self.packet_capture[0], 'dual', self.log_path, self.test_name)
+                self.packet_capture, 'dual', self.log_path, self.test_name)
         time.sleep(SHORT_TIMEOUT)
         network = self.wpapsk_5g
         rand_mac = self.connect_to_network_and_verify_mac_randomization(network)
         pcap_fname = os.path.join(self.log_path, self.test_name,
                          (self.test_name + '_5G.pcap'))
-        wutils.stop_pcap(self.packet_capture[0], self.pcap_procs, False)
+        wutils.stop_pcap(self.packet_capture, self.pcap_procs, False)
         time.sleep(SHORT_TIMEOUT)
         packets = rdpcap(pcap_fname)
         for pkt in packets: