49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
|
|
index 5ff1bf3..4d63954 100644
|
|
--- a/Lib/unittest/__init__.py
|
|
+++ b/Lib/unittest/__init__.py
|
|
@@ -58,7 +58,7 @@ __unittest = True
|
|
|
|
from .result import TestResult
|
|
from .case import (addModuleCleanup, TestCase, FunctionTestCase, SkipTest, skip,
|
|
- skipIf, skipUnless, expectedFailure)
|
|
+ skipIf, skipUnless, expectedFailure, _skipInRpmBuild)
|
|
from .suite import BaseTestSuite, TestSuite
|
|
from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
|
|
findTestCases)
|
|
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
|
|
index a157ae8..64f912c 100644
|
|
--- a/Lib/unittest/case.py
|
|
+++ b/Lib/unittest/case.py
|
|
@@ -3,6 +3,7 @@
|
|
import sys
|
|
import functools
|
|
import difflib
|
|
+import os
|
|
import logging
|
|
import pprint
|
|
import re
|
|
@@ -158,6 +159,22 @@ class _BaseTestCaseContext:
|
|
msg = self.test_case._formatMessage(self.msg, standardMsg)
|
|
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
|
|
+
|
|
class _AssertRaisesBaseContext(_BaseTestCaseContext):
|
|
|
|
def __init__(self, expected, test_case, expected_regex=None):
|