Skip to content

fix(oss): Get integration tests running #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(oss): Get integration tests running #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bbb371
fix(oss): No module named 'psutil'
ben-- Jun 12, 2025
1340bc5
fix(oss): Fix integration tests by running as a pex executable
ben-- Jun 12, 2025
dc38c1e
fix(oss): Get integration tests building
ben-- Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMake/EdenConfigChecks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ endif()

find_package(python-toml REQUIRED)
find_package(python-filelock REQUIRED)
find_package(python-psutil REQUIRED)

# pexpect is used by some of the integration tests.
# If we don't find it we simply won't run those tests.
Expand Down
1 change: 1 addition & 0 deletions build/fbcode_builder/manifests/eden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ rocksdb
re2
libgit2
pexpect
python-psutil
python-toml
python-filelock
edencommon
Expand Down
10 changes: 10 additions & 0 deletions build/fbcode_builder/manifests/python-psutil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[manifest]
name = python-psutil

[download]
url = https://files.pythonhosted.org/packages/bf/b9/b0eb3f3cbcb734d930fdf839431606844a825b23eaf9a6ab371edac8162c/psutil-7.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256 = 4b1388a4f6875d7e2aff5c4ca1cc16c545ed41dd8bb596cefea80111db353a34

[build]
builder = python-wheel

13 changes: 12 additions & 1 deletion eden/integration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,25 @@ if(NOT pexpect_FOUND)
)
endif()

find_package(FBThrift CONFIG REQUIRED)

add_fb_python_unittest(
integration_tests
integration_tests.egg
TYPE "pex"
SOURCES ${INTEGRATION_SRCS}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
DEPENDS
edenfsctl.real.main_lib
eden_integration_lib
eden_hg_integration_lib
python-psutil::python-psutil
FBThrift::thrift_python_cpp
Folly::folly_python_cpp
NORMAL_DEPENDS
FBThrift::thriftcpp2
Folly::folly
fmt::fmt
glog::glog
ENV
"CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
)
Expand Down
13 changes: 12 additions & 1 deletion eden/integration/hg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,23 @@ list(REMOVE_ITEM HG_INTEGRATION_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/eden_journal_test.py
)

find_package(FBThrift CONFIG REQUIRED)

add_fb_python_unittest(
hg_integration_tests
hg_integration_tests.egg
TYPE "pex"
SOURCES ${HG_INTEGRATION_SRCS}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
DEPENDS
FBThrift::thrift_python_cpp
Folly::folly_python_cpp
eden_config_thrift_py
eden_hg_integration_lib
NORMAL_DEPENDS
FBThrift::thriftcpp2
Folly::folly
fmt::fmt
glog::glog
ENV
"CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
)
Expand Down