Skip to content
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

Jump to bottom

nix: Skip the sslyze test on arm #4050

Merged
merged 4 commits into from
Jun 27, 2023
Merged

nix: Skip the sslyze test on arm #4050

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b8421e
nix: skip the sslyze test on aarch64
dougch Jun 16, 2023
4fabb7d
Merge branch 'main' into sslyze_skip
dougch Jun 21, 2023
e7a62bb
Merge branch 'main' into sslyze_skip
dougch Jun 27, 2023
c4a926d
Merge branch 'main' into sslyze_skip
dougch Jun 27, 2023
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
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,12 @@ if (BUILD_TESTING)
# For Nix and environments where LD_LIBRARY_PATH is already correct.
# We're also dropping tox and calling pytest directly, because
# Nix is already handling all of the python setup.
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND ${test_target} STREQUAL "integrationv2_sslyze" )
# sslyze/nassl is not available on aarch64.
message(WARNING "Skipping ${test_target} due to missing tools on ${CMAKE_SYSTEM_PROCESSOR}")
continue()
endif()
message(STATUS "Adding integ test ${test_target}")
add_test(NAME ${test_target}
COMMAND
pytest
Expand Down
27 changes: 15 additions & 12 deletions nix/pyenv.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,18 @@ let
pydantic # >=1.7,<1.9 TODO: check if this version is correct/if it matters
];
};
in pkgs.python310.withPackages (ps: [
ps.pep8
ps.pytest # ==5.3.5 TODO: check if this version is correct/if it matters
ps.pytest-xdist # ==1.34.0 TODO: check if this version is correct/if it matters
sslyze # ==5.0.2 TODO: check if this version is correct/if it matters
ps.pytest-rerunfailures
ps.tox
ps.typing-extensions
ps.setuptools-rust
ps.cryptography
nassl
])
in pkgs.python310.withPackages (ps:
[
ps.pep8
ps.pytest
ps.pytest-xdist
ps.pytest-rerunfailures
ps.typing-extensions
ps.setuptools-rust
ps.cryptography
] ++ (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sslyze test seems to run for every platform except aarch64, but the sslyze dependency is installed only on linux x86_64. Is there any concern about running the integ tests on a platform other than aarch64 or linux x86-64? Like, if you were to try and run the integ tests on mac, would it attempt to run sslyze but fail because the dependency isn't installed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just being cautious here, the other possible platform that might get these packages is x86_64-darwin, which we'll add when doing the darwin nix work. If the dependency can't be installed, the devShell won't even start.

nassl
sslyze
] else
[ ]))

Loading