commit 260332576b96386b18589ec3a52c3d4251e633dc
author tturney <tturney@google.com> Wed Sep 21 17:07:39 2016 -0700
committer tturney <tturney@google.com> Wed Sep 21 17:07:39 2016 -0700
tree 387065429d4dbb6afff61ce16ed9824de7ab00db
parent 32f0c613e8763c37027eba543b68c354a22f3e2e

Remove all suppress usages

Change-Id: I3fd16d1726bfb107d0cf53622762bf7d96a32801

acts/tests/google/ble/gatt/GattToolTest.py

diff --git a/acts/tests/google/ble/gatt/GattToolTest.py b/acts/tests/google/ble/gatt/GattToolTest.py
index 084b76a..fda80c2 100644
--- a/acts/tests/google/ble/gatt/GattToolTest.py
+++ b/acts/tests/google/ble/gatt/GattToolTest.py
@@ -26,7 +26,6 @@
 import pprint
 from queue import Empty
 import time
-from contextlib import suppress
 
 from acts.test_utils.bt.BleEnum import ScanSettingsScanMode
 from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest

acts/tests/google/bt/RfcommTest.py

diff --git a/acts/tests/google/bt/RfcommTest.py b/acts/tests/google/bt/RfcommTest.py
index 26ecad4..47ec598 100644
--- a/acts/tests/google/bt/RfcommTest.py
+++ b/acts/tests/google/bt/RfcommTest.py
@@ -18,7 +18,6 @@
 This test was designed to be run in a shield box.
 """
 
-from contextlib import suppress
 import threading
 import time
 

acts/tests/google/bt/system_tests/RfcommLongevityTest.py

diff --git a/acts/tests/google/bt/system_tests/RfcommLongevityTest.py b/acts/tests/google/bt/system_tests/RfcommLongevityTest.py
index 119b857..0affc85 100644
--- a/acts/tests/google/bt/system_tests/RfcommLongevityTest.py
+++ b/acts/tests/google/bt/system_tests/RfcommLongevityTest.py
@@ -20,7 +20,6 @@
 
 import threading
 import time
-from contextlib import suppress
 from random import randint
 
 from queue import Empty
@@ -56,9 +55,11 @@
                 self.log.info("Failed to reset bluetooth state, retrying...")
 
     def teardown_test(self):
-        with suppress(Exception):
+        try:
             for thread in self.thread_list:
                 thread.join()
+        except Exception:
+            self.log.error("Failed to join threads.")
         for _ in range(5):
             if reset_bluetooth(self.android_devices):
                 break

acts/tests/google/bt/system_tests/RfcommStressTest.py

diff --git a/acts/tests/google/bt/system_tests/RfcommStressTest.py b/acts/tests/google/bt/system_tests/RfcommStressTest.py
index 20d624e..b2899e1 100644
--- a/acts/tests/google/bt/system_tests/RfcommStressTest.py
+++ b/acts/tests/google/bt/system_tests/RfcommStressTest.py
@@ -20,7 +20,6 @@
 
 import threading
 import time
-from contextlib import suppress
 
 from queue import Empty
 from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest

acts/tests/google/bt/test_tools/EnergyTest.py

diff --git a/acts/tests/google/bt/test_tools/EnergyTest.py b/acts/tests/google/bt/test_tools/EnergyTest.py
index 663cefb..efc2bfa 100644
--- a/acts/tests/google/bt/test_tools/EnergyTest.py
+++ b/acts/tests/google/bt/test_tools/EnergyTest.py
@@ -17,7 +17,6 @@
 Continuously poll for energy info for a single Android Device
 """
 
-from contextlib import suppress
 from queue import Empty
 from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
 
@@ -30,7 +29,9 @@
     @BluetoothBaseTest.bt_test_wrap
     def test_continuous_energy_report(self):
         while (True):
-            with suppress(Exception):
+            try:
                 self.log.info(self.android_devices[
                     0].droid.bluetoothGetControllerActivityEnergyInfo(1))
+            except Exception:
+                self.log.error("Failed to log energy info... continuing.")
         return True