f5250ecae7
- Refreshed patches: 55 (systemtap), 102 (lib64), 111 (no static lib), 114 (statvfs flags), 132 (unittest rpmbuild hooks), 134 (fix COUNT_ALLOCS in test_sys), 143 (tsc on ppc64), 146 (hashlib fips), 153 (test gdb noise), 157 (UID+GID overflows), 173 (ENOPROTOOPT in bind_port), 186 (dont raise from py_compile) - Removed patches: 129 (test_subprocess nonreadable dir - no longer fails in Koji), 142 (the mock issue that caused this is fixed) - Added patch 187 (remove thread atfork) - will be in next version - Refreshed script for checking pyc and pyo timestamps with new ignored files. - The fips patch is disabled for now until upstream makes a final decision what to do with sha3 implementation for 3.4.0.
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
diff -up Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/case.py
|
|
--- Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest 2011-09-03 12:16:44.000000000 -0400
|
|
+++ Python-3.2.2/Lib/unittest/case.py 2011-09-09 06:35:16.365568382 -0400
|
|
@@ -3,6 +3,7 @@
|
|
import sys
|
|
import functools
|
|
import difflib
|
|
+import os
|
|
import logging
|
|
import pprint
|
|
import re
|
|
@@ -101,6 +102,43 @@ def expectedFailure(func):
|
|
raise self.test_case.failureException(msg)
|
|
|
|
|
|
+# Non-standard/downstream-only hooks for handling issues with specific test
|
|
+# cases:
|
|
+
|
|
+def _skipInRpmBuild(reason):
|
|
+ """
|
|
+ Non-standard/downstream-only decorator for marking a specific unit test
|
|
+ to be skipped when run within the %check of an rpmbuild.
|
|
+
|
|
+ Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within
|
|
+ the environment, and has no effect otherwise.
|
|
+ """
|
|
+ if 'WITHIN_PYTHON_RPM_BUILD' in os.environ:
|
|
+ return skip(reason)
|
|
+ else:
|
|
+ return _id
|
|
+
|
|
+def _expectedFailureInRpmBuild(func):
|
|
+ """
|
|
+ Non-standard/downstream-only decorator for marking a specific unit test
|
|
+ as expected to fail within the %check of an rpmbuild.
|
|
+
|
|
+ Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within
|
|
+ the environment, and has no effect otherwise.
|
|
+ """
|
|
+ @functools.wraps(func)
|
|
+ def wrapper(*args, **kwargs):
|
|
+ if 'WITHIN_PYTHON_RPM_BUILD' in os.environ:
|
|
+ try:
|
|
+ func(*args, **kwargs)
|
|
+ except Exception:
|
|
+ raise _ExpectedFailure(sys.exc_info())
|
|
+ raise _UnexpectedSuccess
|
|
+ else:
|
|
+ # Call directly:
|
|
+ func(*args, **kwargs)
|
|
+ return wrapper
|
|
+
|
|
class _AssertRaisesBaseContext(_BaseTestCaseContext):
|
|
|
|
def __init__(self, expected, test_case, callable_obj=None,
|
|
diff -up Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/__init__.py
|
|
--- Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest 2011-09-03 12:16:44.000000000 -0400
|
|
+++ Python-3.2.2/Lib/unittest/__init__.py 2011-09-09 06:35:16.366568382 -0400
|
|
@@ -57,7 +57,8 @@ __unittest = True
|
|
|
|
from .result import TestResult
|
|
from .case import (TestCase, FunctionTestCase, SkipTest, skip, skipIf,
|
|
- skipUnless, expectedFailure)
|
|
+ skipUnless, expectedFailure,
|
|
+ _skipInRpmBuild, _expectedFailureInRpmBuild)
|
|
from .suite import BaseTestSuite, TestSuite
|
|
from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
|
|
findTestCases)
|