diff options
| author | Betty Zhou <bettyzhou@google.com> | 2017-02-10 21:43:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-10 21:43:06 +0000 |
| commit | c5b6092e516e89760af118b6be2143b185d3f0ab (patch) | |
| tree | c06db852fa8edec548109856b69a9a585267a9c6 | |
| parent | 99d23f7f69b41c009b2739de25ab42ad8b022ca3 (diff) | |
| parent | 2d89192a473daadb97dc04a3d13bbfad3f6c43fa (diff) | |
| download | platform_tools_test_connectivity-c5b6092e516e89760af118b6be2143b185d3f0ab.tar.gz platform_tools_test_connectivity-c5b6092e516e89760af118b6be2143b185d3f0ab.tar.bz2 platform_tools_test_connectivity-c5b6092e516e89760af118b6be2143b185d3f0ab.zip | |
Fix the Exception typo in setup_droid_properties.
am: 2d89192a47
Change-Id: I8a9e641b387c53145a9e30a89f141be2ebe0c4ab
| -rw-r--r-- | acts/framework/acts/controllers/android.py | 3 | ||||
| -rw-r--r-- | acts/framework/acts/test_utils/tel/tel_test_utils.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/acts/framework/acts/controllers/android.py b/acts/framework/acts/controllers/android.py index cdd1412f79..defa3a4d1f 100644 --- a/acts/framework/acts/controllers/android.py +++ b/acts/framework/acts/controllers/android.py @@ -115,7 +115,8 @@ class Android(object): raise SL4AProtocolError(SL4AProtocolError.NO_RESPONSE_FROM_SERVER) result = json.loads(str(response, encoding="utf8")) if result['error']: - raise SL4AAPIError(result['error']) + raise SL4AAPIError( + "RPC call %s failed with error %s" % (method, result['error'])) if result['id'] != apiid: raise SL4AProtocolError(SL4AProtocolError.MISMATCHED_API_ID) return result['result'] diff --git a/acts/framework/acts/test_utils/tel/tel_test_utils.py b/acts/framework/acts/test_utils/tel/tel_test_utils.py index ce02465ab9..f5cb105cb7 100644 --- a/acts/framework/acts/test_utils/tel/tel_test_utils.py +++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py @@ -166,7 +166,7 @@ def setup_droid_properties(log, ad, sim_filename): except KeyError: number = ad.droid.telephonyGetLine1NumberForSubscription( sub_id) - except Except as e: + except Exception as e: log.error("Failed to setup_droid_property with {}".format(e)) raise if not number or number == "": |