]>
Commit | Line | Data |
---|---|---|
b592c0a2 AM |
1 | --- Python-3.7.0/Lib/test/test_asyncio/test_tasks.py~ 2018-06-28 20:51:03.000000000 +0200 |
2 | +++ Python-3.7.0/Lib/test/test_asyncio/test_tasks.py 2018-06-28 21:01:38.756365097 +0200 | |
3 | @@ -6,6 +6,7 @@ import contextvars | |
4 | import functools | |
5 | import gc | |
6 | import io | |
7 | +import os | |
8 | import random | |
9 | import re | |
10 | import sys | |
3efd6e92 JK |
11 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_asyncio/test_tasks.py Python-3.5.0/Lib/test/test_asyncio/test_tasks.py |
12 | --- Python-3.5.0.orig/Lib/test/test_asyncio/test_tasks.py 2015-09-13 13:41:23.000000000 +0200 | |
7fbb63b9 | 13 | +++ Python-3.5.0/Lib/test/test_asyncio/test_tasks.py 2015-12-03 18:35:52.223668265 +0100 |
3efd6e92 JK |
14 | @@ -1870,6 +1870,7 @@ |
15 | cb.assert_called_once_with(fut) | |
16 | self.assertEqual(fut.result(), [3, 1, exc, exc2]) | |
17 | ||
18 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
19 | def test_env_var_debug(self): | |
20 | aio_path = os.path.dirname(os.path.dirname(asyncio.__file__)) | |
21 | ||
7fbb63b9 JK |
22 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_cmd_line.py Python-3.5.0/Lib/test/test_cmd_line.py |
23 | --- Python-3.5.0.orig/Lib/test/test_cmd_line.py 2015-09-13 13:41:23.000000000 +0200 | |
24 | +++ Python-3.5.0/Lib/test/test_cmd_line.py 2015-12-03 18:35:52.227001621 +0100 | |
25 | @@ -237,6 +237,7 @@ | |
26 | self.assertEqual(rc, 0) | |
27 | self.assertTrue(data.startswith(b'x'), data) | |
28 | ||
29 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
30 | def test_large_PYTHONPATH(self): | |
31 | path1 = "ABCDE" * 100 | |
32 | path2 = "FGHIJ" * 100 | |
33 | @@ -252,6 +253,7 @@ | |
34 | self.assertIn(path1.encode('ascii'), out) | |
35 | self.assertIn(path2.encode('ascii'), out) | |
36 | ||
37 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
38 | def test_empty_PYTHONPATH_issue16309(self): | |
39 | # On Posix, it is documented that setting PATH to the | |
40 | # empty string is equivalent to not setting PATH at all, | |
3efd6e92 | 41 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_compileall.py Python-3.5.0/Lib/test/test_compileall.py |
7fbb63b9 JK |
42 | --- Python-3.5.0.orig/Lib/test/test_compileall.py 2015-12-03 18:35:31.483520885 +0100 |
43 | +++ Python-3.5.0/Lib/test/test_compileall.py 2015-12-03 18:35:52.227001621 +0100 | |
3efd6e92 JK |
44 | @@ -206,6 +206,7 @@ |
45 | def _cleanup(self): | |
46 | support.rmtree(self.directory) | |
47 | ||
48 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
49 | def test_no_args_compiles_path(self): | |
50 | # Note that -l is implied for the no args case. | |
51 | bazfn = script_helper.make_script(self.directory, 'baz', '') | |
52 | @@ -214,6 +215,7 @@ | |
53 | self.assertNotCompiled(self.initfn) | |
54 | self.assertNotCompiled(self.barfn) | |
55 | ||
56 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
57 | def test_no_args_respects_force_flag(self): | |
58 | bazfn = script_helper.make_script(self.directory, 'baz', '') | |
59 | self.assertRunOK(PYTHONPATH=self.directory) | |
60 | @@ -230,6 +232,7 @@ | |
61 | mtime2 = os.stat(pycpath).st_mtime | |
62 | self.assertNotEqual(mtime, mtime2) | |
63 | ||
64 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
65 | def test_no_args_respects_quiet_flag(self): | |
66 | script_helper.make_script(self.directory, 'baz', '') | |
67 | noisy = self.assertRunOK(PYTHONPATH=self.directory) | |
7fbb63b9 JK |
68 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_pydoc.py Python-3.5.0/Lib/test/test_pydoc.py |
69 | --- Python-3.5.0.orig/Lib/test/test_pydoc.py 2015-09-13 13:41:23.000000000 +0200 | |
70 | +++ Python-3.5.0/Lib/test/test_pydoc.py 2015-12-03 18:35:52.227001621 +0100 | |
71 | @@ -631,6 +631,7 @@ | |
72 | self.addCleanup(rmtree, TESTFN) | |
73 | importlib.invalidate_caches() | |
74 | ||
75 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
76 | def test_badimport(self): | |
77 | # This tests the fix for issue 5230, where if pydoc found the module | |
78 | # but the module had an internal import error pydoc would report no doc | |
79 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_site.py Python-3.5.0/Lib/test/test_site.py | |
80 | --- Python-3.5.0.orig/Lib/test/test_site.py 2015-09-13 13:41:23.000000000 +0200 | |
81 | +++ Python-3.5.0/Lib/test/test_site.py 2015-12-03 18:37:57.484550877 +0100 | |
82 | @@ -320,6 +320,7 @@ | |
83 | """Restore sys.path""" | |
84 | sys.path[:] = self.sys_path | |
85 | ||
86 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
87 | def test_abs_paths(self): | |
88 | # Make sure all imported modules have their __file__ and __cached__ | |
89 | # attributes as absolute paths. Arranging to put the Lib directory on | |
3efd6e92 JK |
90 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_venv.py Python-3.5.0/Lib/test/test_venv.py |
91 | --- Python-3.5.0.orig/Lib/test/test_venv.py 2015-09-13 13:41:23.000000000 +0200 | |
7fbb63b9 | 92 | +++ Python-3.5.0/Lib/test/test_venv.py 2015-12-03 18:35:52.227001621 +0100 |
3efd6e92 JK |
93 | @@ -111,6 +111,7 @@ |
94 | self.assertTrue(os.path.exists(fn), 'File %r should exist.' % fn) | |
95 | ||
96 | @skipInVenv | |
97 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
98 | def test_prefixes(self): | |
99 | """ | |
100 | Test that the prefix values are as expected. | |
101 | @@ -249,6 +250,7 @@ | |
102 | # point to the venv being used to run the test, and we lose the link | |
103 | # to the source build - so Python can't initialise properly. | |
104 | @skipInVenv | |
105 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
106 | def test_executable(self): | |
107 | """ | |
108 | Test that the sys.executable value is as expected. | |
109 | @@ -279,6 +281,7 @@ | |
110 | ||
111 | ||
112 | @skipInVenv | |
113 | +@unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
114 | class EnsurePipTest(BaseTest): | |
115 | """Test venv module installation of pip.""" | |
116 | def assert_pip_not_installed(self): | |
117 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_warnings/__init__.py Python-3.5.0/Lib/test/test_warnings/__init__.py | |
7fbb63b9 JK |
118 | --- Python-3.5.0.orig/Lib/test/test_warnings/__init__.py 2015-12-03 18:35:31.483520885 +0100 |
119 | +++ Python-3.5.0/Lib/test/test_warnings/__init__.py 2015-12-03 18:35:52.227001621 +0100 | |
3efd6e92 JK |
120 | @@ -918,6 +918,7 @@ |
121 | ||
122 | class BootstrapTest(unittest.TestCase): | |
123 | @unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled") | |
124 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
125 | def test_issue_8766(self): | |
126 | # "import encodings" emits a warning whereas the warnings is not loaded | |
127 | # or not completely loaded (warnings imports indirectly encodings by |