]>
Commit | Line | Data |
---|---|---|
cd7dc766 JK |
1 | diff -dur -x '*~' Lib/test.orig//regrtest.py Lib/test//regrtest.py |
2 | --- Lib/test.orig//regrtest.py 2011-07-09 08:58:49.000000000 +0200 | |
3 | +++ Lib/test//regrtest.py 2011-07-15 14:38:55.000000000 +0200 | |
4 | @@ -216,7 +216,7 @@ | |
5 | ||
6 | from test import support | |
7 | ||
8 | -RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', | |
9 | +RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'cmdline', | |
10 | 'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui') | |
11 | ||
12 | TEMPDIR = os.path.abspath(tempfile.gettempdir()) | |
13 | diff -dur -x '*~' Lib/test.orig//test_compileall.py Lib/test//test_compileall.py | |
14 | --- Lib/test.orig//test_compileall.py 2011-07-09 08:58:50.000000000 +0200 | |
15 | +++ Lib/test//test_compileall.py 2011-07-15 14:41:08.000000000 +0200 | |
16 | @@ -130,7 +130,7 @@ | |
17 | finally: | |
18 | sys.stdout = orig_stdout | |
19 | ||
20 | - | |
21 | +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled") | |
22 | class CommandLineTests(unittest.TestCase): | |
23 | """Test compileall's CLI.""" | |
24 | ||
25 | diff -dur -x '*~' Lib/test.orig//test_warnings.py Lib/test//test_warnings.py | |
26 | --- Lib/test.orig//test_warnings.py 2011-07-09 08:58:51.000000000 +0200 | |
27 | +++ Lib/test//test_warnings.py 2011-07-15 14:44:11.000000000 +0200 | |
28 | @@ -715,6 +715,7 @@ | |
29 | module = py_warnings | |
30 | ||
31 | ||
32 | +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled") | |
33 | class EnvironmentVariableTests(BaseTest): | |
34 | ||
35 | def test_single_warning(self): | |
36 | @@ -760,14 +761,17 @@ | |
37 | "['ignore:DeprecaciónWarning']".encode('utf-8')) | |
38 | self.assertEqual(p.wait(), 0) | |
39 | ||
40 | +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled") | |
41 | class CEnvironmentVariableTests(EnvironmentVariableTests): | |
42 | module = c_warnings | |
43 | ||
44 | +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled") | |
45 | class PyEnvironmentVariableTests(EnvironmentVariableTests): | |
46 | module = py_warnings | |
47 | ||
48 | ||
49 | class BootstrapTest(unittest.TestCase): | |
50 | + @unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled") | |
51 | def test_issue_8766(self): | |
52 | # "import encodings" emits a warning whereas the warnings is not loaded | |
53 | # or not completely loaded (warnings imports indirectly encodings by |