projects / packages / python3.git / blame
| Commit | Line | Data |
|---|---|---|
| 3efd6e92 JK |
1 | 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 |
| 2 | --- Python-3.5.0.orig/Lib/test/test_asyncio/test_tasks.py 2015-09-13 13:41:23.000000000 +0200 | |
| 3 | +++ Python-3.5.0/Lib/test/test_asyncio/test_tasks.py 2015-12-03 17:43:19.313492409 +0100 | |
| 4 | @@ -1870,6 +1870,7 @@ | |
| 5 | cb.assert_called_once_with(fut) | |
| 6 | self.assertEqual(fut.result(), [3, 1, exc, exc2]) | |
| 7 | ||
| 8 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 9 | def test_env_var_debug(self): | |
| 10 | aio_path = os.path.dirname(os.path.dirname(asyncio.__file__)) | |
| 11 | ||
| 12 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_compileall.py Python-3.5.0/Lib/test/test_compileall.py | |
| 13 | --- Python-3.5.0.orig/Lib/test/test_compileall.py 2015-12-03 17:34:50.856171946 +0100 | |
| 14 | +++ Python-3.5.0/Lib/test/test_compileall.py 2015-12-03 17:42:47.669939423 +0100 | |
| 15 | @@ -206,6 +206,7 @@ | |
| 16 | def _cleanup(self): | |
| 17 | support.rmtree(self.directory) | |
| 18 | ||
| 19 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 20 | def test_no_args_compiles_path(self): | |
| 21 | # Note that -l is implied for the no args case. | |
| 22 | bazfn = script_helper.make_script(self.directory, 'baz', '') | |
| 23 | @@ -214,6 +215,7 @@ | |
| 24 | self.assertNotCompiled(self.initfn) | |
| 25 | self.assertNotCompiled(self.barfn) | |
| 26 | ||
| 27 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 28 | def test_no_args_respects_force_flag(self): | |
| 29 | bazfn = script_helper.make_script(self.directory, 'baz', '') | |
| 30 | self.assertRunOK(PYTHONPATH=self.directory) | |
| 31 | @@ -230,6 +232,7 @@ | |
| 32 | mtime2 = os.stat(pycpath).st_mtime | |
| 33 | self.assertNotEqual(mtime, mtime2) | |
| 34 | ||
| 35 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 36 | def test_no_args_respects_quiet_flag(self): | |
| 37 | script_helper.make_script(self.directory, 'baz', '') | |
| 38 | noisy = self.assertRunOK(PYTHONPATH=self.directory) | |
| 39 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_venv.py Python-3.5.0/Lib/test/test_venv.py | |
| 40 | --- Python-3.5.0.orig/Lib/test/test_venv.py 2015-09-13 13:41:23.000000000 +0200 | |
| 41 | +++ Python-3.5.0/Lib/test/test_venv.py 2015-12-03 17:47:16.138342748 +0100 | |
| 42 | @@ -111,6 +111,7 @@ | |
| 43 | self.assertTrue(os.path.exists(fn), 'File %r should exist.' % fn) | |
| 44 | ||
| 45 | @skipInVenv | |
| 46 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 47 | def test_prefixes(self): | |
| 48 | """ | |
| 49 | Test that the prefix values are as expected. | |
| 50 | @@ -249,6 +250,7 @@ | |
| 51 | # point to the venv being used to run the test, and we lose the link | |
| 52 | # to the source build - so Python can't initialise properly. | |
| 53 | @skipInVenv | |
| 54 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 55 | def test_executable(self): | |
| 56 | """ | |
| 57 | Test that the sys.executable value is as expected. | |
| 58 | @@ -279,6 +281,7 @@ | |
| 59 | ||
| 60 | ||
| 61 | @skipInVenv | |
| 62 | +@unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 63 | class EnsurePipTest(BaseTest): | |
| 64 | """Test venv module installation of pip.""" | |
| 65 | def assert_pip_not_installed(self): | |
| 66 | diff -dur -x '*~' Python-3.5.0.orig/Lib/test/test_warnings/__init__.py Python-3.5.0/Lib/test/test_warnings/__init__.py | |
| 67 | --- Python-3.5.0.orig/Lib/test/test_warnings/__init__.py 2015-12-03 17:34:50.856171946 +0100 | |
| 68 | +++ Python-3.5.0/Lib/test/test_warnings/__init__.py 2015-12-03 17:47:52.121893369 +0100 | |
| 69 | @@ -918,6 +918,7 @@ | |
| 70 | ||
| 71 | class BootstrapTest(unittest.TestCase): | |
| 72 | @unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled") | |
| 73 | + @unittest.skipIf("PYTHONPATH" in os.environ, "$PYTHONPATH set") | |
| 74 | def test_issue_8766(self): | |
| 75 | # "import encodings" emits a warning whereas the warnings is not loaded | |
| 76 | # or not completely loaded (warnings imports indirectly encodings by |