oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle src/gevent/... paths

Browse source
This commit is contained in:
Ivanq 2020-10-13 19:50:08 +03:00
parent 9b2772b171
commit 6770b450b3
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Debug/Debug.py
View file

@ -47,7 +47,11 @@ def formatTraceback(items, limit=None, fold_builtin=True):
is_last = i == len(items) is_last = i == len(items)
path = path.replace("\\", "/") path = path.replace("\\", "/")
if path in ("<frozen importlib._bootstrap>", "<frozen importlib._bootstrap_external>"): if path.startswith("src/gevent/"):
file_title = "<gevent>/" + path[len("src/gevent/"):]
is_builtin = True
is_skippable_builtin = False
elif path in ("<frozen importlib._bootstrap>", "<frozen importlib._bootstrap_external>"):
file_title = "(importlib)" file_title = "(importlib)"
is_builtin = True is_builtin = True
is_skippable_builtin = True is_skippable_builtin = True

11
src/Test/TestDebug.py
View file

@ -19,11 +19,12 @@ class TestDebug:
(["C:\\ZeroNet\\core\\src\\main.py:13"], ["?/src/main.py line 13"]), (["C:\\ZeroNet\\core\\src\\main.py:13"], ["?/src/main.py line 13"]),
(["/root/main.py:17"], ["/root/main.py line 17"]), (["/root/main.py:17"], ["/root/main.py line 17"]),
(["{gevent}:13"], ["<gevent>/__init__.py line 13"]), # modules (["{gevent}:13"], ["<gevent>/__init__.py line 13"]), # modules
(["{os}:13"], ["<os> line 13"]), # python builtin modules, (["{os}:13"], ["<os> line 13"]), # python builtin modules
(["src/gevent/event.py:17"], ["<gevent>/event.py line 17"]), # gevent-overriden __file__
(["@/src/Db/Db.py:17", "@/src/Db/DbQuery.py:1"], ["Db.py line 17", "DbQuery.py line 1"]), # mutliple args (["@/src/Db/Db.py:17", "@/src/Db/DbQuery.py:1"], ["Db.py line 17", "DbQuery.py line 1"]), # mutliple args
(["@/src/Db/Db.py:17", "@/src/Db/Db.py:1"], ["Db.py line 17", "1"]), # same file (["@/src/Db/Db.py:17", "@/src/Db/Db.py:1"], ["Db.py line 17", "1"]), # same file
(["{os}:1", "@/src/Db/Db.py:17"], ["<os> line 1", "Db.py line 17"]), # builtins (["{os}:1", "@/src/Db/Db.py:17"], ["<os> line 1", "Db.py line 17"]), # builtins
(["{gevent}:1"] + ["{os}:3"] * 4 + ["@/src/Db/Db.py:17"], ["<gevent>/__init__.py line 1", "...", "Db.py line 17"]), (["{gevent}:1"] + ["{os}:3"] * 4 + ["@/src/Db/Db.py:17"], ["<gevent>/__init__.py line 1", "...", "Db.py line 17"])
]) ])
def testFormatTraceback(self, items, expected): def testFormatTraceback(self, items, expected):
q_items = [] q_items = []
@ -41,12 +42,12 @@ class TestDebug:
try: try:
raise ValueError("Test exception") raise ValueError("Test exception")
except: except:
assert Debug.formatException() == "ValueError: Test exception in TestDebug.py line 42" assert Debug.formatException() == "ValueError: Test exception in TestDebug.py line 43"
try: try:
os.path.abspath(1) os.path.abspath(1)
except: except:
assert Debug.formatException().startswith("TypeError: expected str, bytes or os.PathLike object, not int in TestDebug.py line 46 > <posixpath> line ") assert Debug.formatException().startswith("TypeError: expected str, bytes or os.PathLike object, not int in TestDebug.py line 47 > <posixpath> line ")
def testFormatStack(self): def testFormatStack(self):
assert Debug.formatStack().startswith("TestDebug.py line 52 > <_pytest>/python.py line ") assert Debug.formatStack().startswith("TestDebug.py line 53 > <_pytest>/python.py line ")