diff options
| author | Dan Halbert <halbert@adafruit.com> | 2019-06-27 18:48:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 18:48:03 -0400 |
| commit | f0a112ef5d04fc17a49ad8e2d74e5e23f3c40dd5 (patch) | |
| tree | 81ca7ee2cf4f8b47316c916bc9b53e47c53cda2b /tests/import | |
| parent | 72ea216dceff146ff654e6652e5535064dfe69ee (diff) | |
| parent | 0cce7fcaa3295d18f4fb7e10821ab692d5b2f4d7 (diff) | |
Merge pull request #1975 from tannewt/merge_in_4024.1.0-beta.1
Merge in 4.0.2
Diffstat (limited to 'tests/import')
| -rw-r--r-- | tests/import/mpy_invalid.py | 4 | ||||
| -rw-r--r-- | tests/import/mpy_invalid.py.exp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/import/mpy_invalid.py b/tests/import/mpy_invalid.py index 6a4e116e7..b9dd99a44 100644 --- a/tests/import/mpy_invalid.py +++ b/tests/import/mpy_invalid.py @@ -59,8 +59,8 @@ for i in range(len(user_files)): mod = 'mod%u' % i try: __import__(mod) - except ValueError as er: - print(mod, 'ValueError', er) + except Exception as e: + print(mod, type(e).__name__, e) # unmount and undo path addition uos.umount('/userfs') diff --git a/tests/import/mpy_invalid.py.exp b/tests/import/mpy_invalid.py.exp index e4f2b13e9..197eb4f7b 100644 --- a/tests/import/mpy_invalid.py.exp +++ b/tests/import/mpy_invalid.py.exp @@ -1,3 +1,3 @@ -mod0 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info. -mod1 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info. -mod2 ValueError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info. +mod0 RuntimeError Corrupt .mpy file +mod1 RuntimeError Corrupt .mpy file +mod2 MpyError Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/mpy-update for more info. |