Repaired last broken test - filesystem honors UTIME_OMIT and UTIME_NOW and handles them correctly. flag_utime_omit_ok=1 is passed into libfuse2, triggering

utimens even when UTIME_OMIT has been passed into utimensat.

Author: s-m-e

README.rst

@@ -14,12 +14,7 @@ LoggedFS-python - Filesystem monitoring with Fuse and Python
 PROJECT STATUS NOTICE: **BETA** (UNDER DEVELOPMENT)
 ---------------------------------------------------
 
-FILESYSTEM PASSES `TEST SUITE FOR POSIX COMPLIANCE`_ - WITH ONE EXCEPTION:
-
-- UPDATING *ATIME* AND *MTIME* FAILS UNDER CERTAIN CIRCUMSTANCES.
-  THE ROOT SOURCE CAN LIKELY BE FOUND IN LIBFUSE **2**.
-  THIS IS UNDER FURTHER INVESTIGATION.
-  ONE TEST WHICH FAILS BECAUSE OF IT IS THEREFORE CURRENTLY BEING IGNORED.
+FILESYSTEM PASSES `TEST SUITE FOR POSIX COMPLIANCE`_ - ALL OF IT.
 
 A CUSTOM BUG-FIXED VERSION OF `FUSEPY`_ IS REQUIRED FOR FULL POSIX COMPLIANCE.
 IF THE LATEST OFFICIAL RELEASE OF FUSEPY IS USED INSTEAD, TIMESTAMPS WILL BE

src/loggedfs/core.py

@@ -40,6 +40,7 @@
 import re
 import stat
 import sys
+import time
 
 import fuse
 from fuse import (
@@ -260,6 +261,7 @@ class loggedfs: # (Operations):
 
 
 	WITH_NANOSECOND_INT = True
+	flag_utime_omit_ok = 1
 
 
 	def __init__(self,
@@ -604,10 +606,30 @@ def unlink(self, path):
 	@__log__(format_pattern = '{0}', abs_path_fields = [0])
 	def utimens(self, path, times = None):
 
+		UTIME_OMIT = (1 << 30) - 2
+		UTIME_NOW = (1 << 30) - 1
+
+		def _fix_time_(atime, mtime):
+			if UTIME_OMIT in (atime, mtime):
+				st = os.lstat(relpath, dir_fd = self.root_path_fd)
+				if atime == UTIME_OMIT:
+					atime = st.st_atime_ns
+				if mtime == UTIME_OMIT:
+					mtime = st.st_mtime_ns
+			if UTIME_NOW in (atime, mtime):
+				now = int(time.time() * 10**9)
+				if atime == UTIME_NOW:
+					atime = now
+				if mtime == UTIME_NOW:
+					mtime = now
+			return (atime, mtime)
+
+		relpath = self._rel_path(path)
+
 		if self.flag_nanosecond_int:
-			os.utime(self._rel_path(path), ns = times, dir_fd = self.root_path_fd, follow_symlinks = False)
+			os.utime(relpath, ns = _fix_time_(*times), dir_fd = self.root_path_fd, follow_symlinks = False)
 		else:
-			os.utime(self._rel_path(path), times = times, dir_fd = self.root_path_fd, follow_symlinks = False)
+			os.utime(relpath, times = times, dir_fd = self.root_path_fd, follow_symlinks = False)
 
 
 	@__log__(format_pattern = '{1} bytes to {0} at offset {2}', abs_path_fields = [0], length_fields = [1])

tests/loggedfs_libtest/param.py

@@ -128,9 +128,7 @@ def __ignore_tests__(old_group_list):
 		# ('rmdir', 3),
 		# ('rename', 2)
 		# ] # The original LoggedFS crashes when tested against those.
-	xfail_group_list = [
-		('utimensat', 2)
-		] # likely bugs in libfuse 2.9
+	xfail_group_list = []
 
 	for group_path in old_group_list: