Merge branch 'marc/298-tests-fail-when-symlink-support-is-disabled' into 'master' (950ba459) · Commits · hpc / gekkofs

CHANGELOG.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,8 @@ replicas ([!166](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/141)

		- An issue that updated the last modified time of a file during `stat` operations was
		fixed([!176](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/176)).
		- Fixed a dependency conflict within the pytest dependency marshmallow ([!197](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/197)).
		- Fixed an issue with testing external symbolic links ([!198](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/198)).

		## [0.9.2] - 2024-02

+207 −207

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ gkfs_define_option(
		gkfs_define_option(
		GKFS_SYMLINK_SUPPORT
		HELP_TEXT "Enable support for symlinks"
		DEFAULT_VALUE ON
		DEFAULT_VALUE OFF
		DESCRIPTION "Enable support for symbolic links in paths"
		)

+1 −2

Original line number	Diff line number	Diff line
		@@ -478,8 +478,7 @@ srun: sending Ctrl-C to StepId=282378.2
		- `GKFS_MAX_INTERNAL_FDS` - Number of file descriptors reserved for internal use (default: 256)
		- `GKFS_MAX_OPEN_FDS` - Maximum number of open file descriptors supported (default: 1024)
		- `GKFS_RENAME_SUPPORT` - Enable support for rename (default: OFF)
		- `GKFS_SYMLINK_SUPPORT` - Enable support for symlinks (default: ON)
		- `GKFS_FOLLOW_EXTERNAL_SYMLINKS` - Enable support for following external links for resolving the path (default: OFF)
		- `GKFS_FOLLOW_EXTERNAL_SYMLINKS` - Enable support for following external links into the GekkoFS namespace (default: OFF)
		- `GKFS_USE_LEGACY_PATH_RESOLVE` - Use the legacy implementation of the resolve function, deprecated (default: OFF)
		- `GKFS_USE_GUIDED_DISTRIBUTION` - Use guided data distributor (default: OFF)
		- `GKFS_USE_GUIDED_DISTRIBUTION_PATH` - File Path for guided distributor (default: /tmp/guided.txt)

+88 −84

Original line number	Diff line number	Diff line
		@@ -65,11 +65,15 @@ gkfs_enable_python_testing(
		)

		# define CTest tests for functional test groups
		set(DIRECTORY_TESTS "directories/test_directories.py;directories/test_pathresolution.py")
		if (GKFS_FOLLOW_EXTERNAL_SYMLINKS)
		set(DIRECTORY_TESTS "${DIRECTORY_TESTS}" ";directories/test_external_symlink.py")
		endif ()
		gkfs_add_python_test(
		NAME test_directories
		PYTHON_VERSION 3.6
		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/integration
		SOURCE directories/
		SOURCE ${DIRECTORY_TESTS}
		)

		if (GLIBC_HAS_STATX)
		@@ -146,7 +150,7 @@ if(GKFS_INSTALL_TESTS)
		PATTERN "gkfs.io" EXCLUDE
		)

		if(GKFS_SYMLINK_SUPPORT)
		if (GKFS_FOLLOW_EXTERNAL_SYMLINKS)
		install(DIRECTORY directories
		DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gkfs/tests/integration
		FILES_MATCHING
		@@ -161,7 +165,7 @@ if(GKFS_INSTALL_TESTS)
		REGEX ".*\\.py"
		PATTERN "__pycache__" EXCLUDE
		PATTERN ".pytest_cache" EXCLUDE
		PATTERN "test_symlink.py" EXCLUDE
		PATTERN "test_external_symlink.py" EXCLUDE

		)
		endif ()

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ from harness.logger import logger
		nonexisting = "nonexisting"

		#@pytest.mark.xfail(reason="invalid errno returned on success")
		def test_symlink(gkfs_daemon, gkfs_client):
		def test_external_symlink(gkfs_daemon, gkfs_client):
		"""Testing different path resolution capabilities: symlinks"""
		pid = os.getpid().__str__()
		mountdir = gkfs_daemon.mountdir