Merge "Add tcpdump for debugging"
diff --git a/acts/tests/google/net/DataCostTest.py b/acts/tests/google/net/DataCostTest.py
index 617626f..d8c8944 100644
--- a/acts/tests/google/net/DataCostTest.py
+++ b/acts/tests/google/net/DataCostTest.py
@@ -51,6 +51,8 @@
         for ad in self.android_devices:
             nutils.verify_lte_data_and_tethering_supported(ad)
 
+        self.tcpdump_pid = None
+
     def teardown_class(self):
         """ Reset settings to default """
         for ad in self.android_devices:
@@ -59,6 +61,12 @@
             ad.droid.connectivitySetDataWarningLimit(sub_id, -1)
             wutils.reset_wifi(ad)
 
+
+    def teardown_test(self):
+        if self.tcpdump_pid:
+            nutils.stop_tcpdump(self.dut, self.tcpdump_pid, self.test_name)
+            self.tcpdump_pid = None
+
     def on_fail(self, test_name, begin_time):
         for ad in self.android_devices:
             ad.take_bug_report(test_name, begin_time)
@@ -168,6 +176,9 @@
         ad = self.android_devices[0]
         self._clear_netstats(ad)
 
+        self.dut = ad
+        self.tcpdump_pid = nutils.start_tcpdump(ad, self.test_name)
+
         sub_id = str(ad.droid.telephonyGetSubscriberId())
         cell_network = ad.droid.connectivityGetActiveNetwork()
         self.log.info("cell network %s" % cell_network)
@@ -214,6 +225,9 @@
         ad = self.android_devices[1]
         self._clear_netstats(ad)
 
+        self.dut = ad
+        self.tcpdump_pid = nutils.start_tcpdump(ad, self.test_name)
+
         cell_network = ad.droid.connectivityGetActiveNetwork()
         self.log.info("cell network %s" % cell_network)
         wutils.wifi_connect(ad, self.wifi_network)