facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-04 22:07:44 +03:00
Code Issues Projects Releases Wiki Activity

fix eden build with python 3.12 (#778)

Browse Source 
Summary:
X-link: https://github.com/facebookincubator/velox/pull/7653

fix eden build with python 3.12

python 3.12 removes many long deprecated unittest features including  _TextTestResult (deprecated in Python 3.2)

notices as fedora 39 ships with python 3.12

Pull Request resolved: https://github.com/facebook/sapling/pull/778

Test Plan:
Local build with `./build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. eden`

Before:
```
FAILED: eden/integration/CMakeFiles/integration_tests.GEN_PY_EXE.util eden/integration/integration_tests_tests.cmake /home/alex/local/tmp/fridge/fbcode_builder_getdeps-ZhomeZalexZlocalZsaplingZbuildZfbcode_builder/build/eden/eden/integration/integration_tests_tests.cmake
cd /home/alex/local/tmp/fridge/fbcode_builder_getdeps-ZhomeZalexZlocalZsaplingZbuildZfbcode_builder/build/eden/eden/integration && /usr/bin/cmake -D TEST_TARGET=integration_tests -D TEST_INTERPRETER=/usr/bin/python3.12 -D TEST_ENV=CMAKE_SOURCE_DIR=/home/alex/local/sapling -D TEST_EXECUTABLE=/home/alex/local/tmp/fridge/fbcode_builder_getdeps-ZhomeZalexZlocalZsaplingZbuildZfbcode_builder/build/eden/eden/integration/integration_tests -D TEST_WORKING_DIR=/home/alex/local/tmp/fridge/fbcode_builder_getdeps-ZhomeZalexZlocalZsaplingZbuildZfbcode_builder/build/eden -D TEST_LIST=integration_tests_TESTS -D TEST_PREFIX=integration_tests:: -D TEST_PROPERTIES= -D CTEST_FILE=/home/alex/local/tmp/fridge/fbcode_builder_getdeps-ZhomeZalexZlocalZsaplingZbuildZfbcode_builder/build/eden/eden/integration/integration_tests_tests.cmake -P /home/alex/local/sapling/build/fbcode_builder/CMake/FBPythonTestAddTests.cmake
Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/home/alex/local/tmp/fridge/fbcode_builder_getdeps-ZhomeZalexZlocalZsaplingZbuildZfbcode_builder/build/eden/eden/integration/integration_tests/__main__.py", line 197, in <module>
  File "/usr/lib64/python3.12/unittest/__init__.py", line 85, in __getattr__
    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
AttributeError: module 'unittest' has no attribute '_TextTestResult'. Did you mean: 'TextTestResult'?
```

After, works

Differential Revision: D51455615

fbshipit-source-id: f690f14b24b2645578113f769669179fba476657
This commit is contained in:
Alex Hornby 2023-11-20 07:20:07 -08:00 committed by Facebook GitHub Bot
parent d49da7b6f9
commit 35dceece26
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/fbcode_builder/CMake/fb_py_test_main.py
View File

@ -194,7 +194,7 @@ class CallbackStream(object):
return self._fileno return self._fileno
class BuckTestResult(unittest._TextTestResult): class BuckTestResult(unittest.TextTestResult):
""" """
Our own TestResult class that outputs data in a format that can be easily Our own TestResult class that outputs data in a format that can be easily
parsed by buck's test runner. parsed by buck's test runner.

6
eden/scm/tests/run-tests.py
View File

@ -2402,7 +2402,7 @@ class IOLockWithProgress:
iolock = showprogress and IOLockWithProgress() or _iolock iolock = showprogress and IOLockWithProgress() or _iolock
class TestResult(unittest._TextTestResult): class TestResult(unittest.TextTestResult):
"""Holds results when executing via unittest.""" """Holds results when executing via unittest."""
# Don't worry too much about accessing the non-public _TextTestResult. # Don't worry too much about accessing the non-public _TextTestResult.
@ -2459,7 +2459,7 @@ class TestResult(unittest._TextTestResult):
def addSuccess(self, test): def addSuccess(self, test):
if showprogress and not self.showAll: if showprogress and not self.showAll:
super(unittest._TextTestResult, self).addSuccess(test) super(unittest.TextTestResult, self).addSuccess(test)
else: else:
with iolock: with iolock:
super(TestResult, self).addSuccess(test) super(TestResult, self).addSuccess(test)
@ -2467,7 +2467,7 @@ class TestResult(unittest._TextTestResult):
def addError(self, test, err): def addError(self, test, err):
if showprogress and not self.showAll: if showprogress and not self.showAll:
super(unittest._TextTestResult, self).addError(test, err) super(unittest.TextTestResult, self).addError(test, err)
else: else:
with iolock: with iolock:
super(TestResult, self).addError(test, err) super(TestResult, self).addError(test, err)