1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- contrib/python/traitlets/py3/tests/config/test_configurable.py (index)
+++ contrib/python/traitlets/py3/tests/config/test_configurable.py (working tree)
@@ -11,1 +11,1 @@ from traitlets.traitlets import (
-from tests._warnings import expected_warnings
+from .._warnings import expected_warnings
--- contrib/python/traitlets/py3/tests/config/test_application.py (index)
+++ contrib/python/traitlets/py3/tests/config/test_application.py (working tree)
@@ -635,2 +635,3 @@ class TestApplication(TestCase):
+@pytest.mark.skip
def test_cli_multi_scalar(caplog):
@@ -655,1 +656,1 @@ def test_cli_multi_scalar(caplog):
- "sub1": ("tests.config.test_application.Sub1", "import string"),
+ "sub1": ("__tests__.config.test_application.Sub1", "import string"),
--- contrib/python/traitlets/py3/traitlets/tests/utils.py (index)
+++ contrib/python/traitlets/py3/traitlets/tests/utils.py (working tree)
@@ -1,1 +1,4 @@
- p = Popen(cmd, stdout=PIPE, stderr=PIPE) # noqa: S603
+ import os
+ env = os.environ.copy()
+ env["Y_PYTHON_ENTRY_POINT"] = ":main"
+ p = Popen(cmd, stdout=PIPE, stderr=PIPE, env=env) # noqa: S603
|
