diff options
| author | Betty Zhou <bettyzhou@google.com> | 2017-02-10 21:45:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-10 21:45:07 +0000 |
| commit | a635aec7df8de4c9ffecfef7f3e44b31171b5641 (patch) | |
| tree | daeb86d7154df81b1216d3bde50f906674c25926 | |
| parent | 31e68ae9df68fa8592201deca7b17022cc8d4745 (diff) | |
| parent | c5b6092e516e89760af118b6be2143b185d3f0ab (diff) | |
| download | platform_tools_test_connectivity-nougat-mr2-release.tar.gz platform_tools_test_connectivity-nougat-mr2-release.tar.bz2 platform_tools_test_connectivity-nougat-mr2-release.zip | |
Fix the Exception typo in setup_droid_properties. am: 2d89192a47android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-dev
am: c5b6092e51
Change-Id: Icd560768d4294aa98855bb08c8e8dcecd2fe6a74
| -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 == "": |