Skip to content

Commit 4b4f0a3

Browse files
committed
fix pytest-6.2.patch
1 parent 0289249 commit 4b4f0a3

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

graalpython/lib-graalpython/patches/pytest/whl/pytest-6.2.patch

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
1+
diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py
22
index 4230693..1c9bab8 100644
3-
--- a/src/_pytest/_code/code.py
4-
+++ b/src/_pytest/_code/code.py
3+
--- a/_pytest/_code/code.py
4+
+++ b/_pytest/_code/code.py
55
@@ -248,15 +248,17 @@ class TracebackEntry:
66
if key is not None:
77
astnode = astcache.get(key, None)
@@ -29,18 +29,16 @@ index 4230693..1c9bab8 100644
2929
return source[start:end]
3030

3131
source = property(getsource)
32-
diff --git a/src/_pytest/assertion/__init__.py b/src/_pytest/assertion/__init__.py
33-
index a18cf19..bd7523c 100644
34-
--- a/src/_pytest/assertion/__init__.py
35-
+++ b/src/_pytest/assertion/__init__.py
36-
@@ -26,7 +26,8 @@ def pytest_addoption(parser: Parser) -> None:
32+
diff --git a/_pytest/assertion/__init__.py b/_pytest/assertion/__init__.py
33+
index a18cf19..787dd09 100644
34+
--- a/_pytest/assertion/__init__.py
35+
+++ b/_pytest/assertion/__init__.py
36+
@@ -26,7 +26,7 @@ def pytest_addoption(parser: Parser) -> None:
3737
action="store",
3838
dest="assertmode",
3939
choices=("rewrite", "plain"),
4040
- default="rewrite",
41-
+ # default="rewrite",
4241
+ default="plain",
4342
metavar="MODE",
4443
help=(
4544
"Control assertion debugging tools.\n"
46-

0 commit comments

Comments
 (0)