Skip to content
Snippets Groups Projects
Commit 23d02fd0 authored by juanf's avatar juanf
Browse files

SSDM-13521: Trying to fix tests on ci that produce non reproducible errors on Mac

parent 3fe562b9
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -323,8 +323,8 @@ public final class Posix ...@@ -323,8 +323,8 @@ public final class Posix
FileTime accessTime = FileTime.from(accessTimeInstant); FileTime accessTime = FileTime.from(accessTimeInstant);
Instant modifiedTimeInstant = Instant.ofEpochSecond(modificationTimeSecs).plus(modificationTimeMicroSecs, ChronoUnit.MICROS); Instant modifiedTimeInstant = Instant.ofEpochSecond(modificationTimeSecs).plus(modificationTimeMicroSecs, ChronoUnit.MICROS);
FileTime modifiedTime = FileTime.from(modifiedTimeInstant); FileTime modifiedTime = FileTime.from(modifiedTimeInstant);
Files.getFileAttributeView(Path.of(fileName), BasicFileAttributeView.class, LinkOption.NOFOLLOW_LINKS).setTimes(modifiedTime, accessTime, null); Files.getFileAttributeView(Path.of(fileName), PosixFileAttributeView.class, LinkOption.NOFOLLOW_LINKS).setTimes(modifiedTime, accessTime, null);
Files.getFileAttributeView(Path.of(fileName), BasicFileAttributeView.class).setTimes(modifiedTime, accessTime, null); Files.getFileAttributeView(Path.of(fileName), PosixFileAttributeView.class).setTimes(modifiedTime, accessTime, null);
} catch (IOException e) } catch (IOException e)
{ {
throw new IOExceptionUnchecked(e); throw new IOExceptionUnchecked(e);
...@@ -361,7 +361,7 @@ public final class Posix ...@@ -361,7 +361,7 @@ public final class Posix
FileTime accessTime = FileTime.from(accessTimeInstant); FileTime accessTime = FileTime.from(accessTimeInstant);
Instant modifiedTimeInstant = Instant.ofEpochSecond(modificationTimeSecs).plus(modificationTimeMicroSecs, ChronoUnit.MICROS); Instant modifiedTimeInstant = Instant.ofEpochSecond(modificationTimeSecs).plus(modificationTimeMicroSecs, ChronoUnit.MICROS);
FileTime modifiedTime = FileTime.from(modifiedTimeInstant); FileTime modifiedTime = FileTime.from(modifiedTimeInstant);
Files.getFileAttributeView(Path.of(fileName), BasicFileAttributeView.class).setTimes(modifiedTime, accessTime, null); Files.getFileAttributeView(Path.of(fileName), PosixFileAttributeView.class).setTimes(modifiedTime, accessTime, null);
} catch (IOException e) } catch (IOException e)
{ {
throw new IOExceptionUnchecked(e); throw new IOExceptionUnchecked(e);
...@@ -686,7 +686,7 @@ public final class Posix ...@@ -686,7 +686,7 @@ public final class Posix
} }
BasicFileAttributes attrs = null; PosixFileAttributes attrs = null;
FileLinkType linkType; FileLinkType linkType;
short permissions; short permissions;
int uid; int uid;
...@@ -694,7 +694,7 @@ public final class Posix ...@@ -694,7 +694,7 @@ public final class Posix
if(readSymbolicLinkTarget && Files.exists(path)) if(readSymbolicLinkTarget && Files.exists(path))
{ {
permissions = getNumericAccessMode(Files.getPosixFilePermissions(path)); permissions = getNumericAccessMode(Files.getPosixFilePermissions(path));
attrs = Files.readAttributes(path, BasicFileAttributes.class); attrs = Files.readAttributes(path, PosixFileAttributes.class);
if (Files.isSymbolicLink(path)) { if (Files.isSymbolicLink(path)) {
linkType = FileLinkType.SYMLINK; linkType = FileLinkType.SYMLINK;
} else if (Files.isDirectory(path)) { } else if (Files.isDirectory(path)) {
...@@ -708,7 +708,7 @@ public final class Posix ...@@ -708,7 +708,7 @@ public final class Posix
gid = getGid(pathAsString); gid = getGid(pathAsString);
} else { } else {
permissions = getNumericAccessMode(Files.getPosixFilePermissions(path, LinkOption.NOFOLLOW_LINKS)); permissions = getNumericAccessMode(Files.getPosixFilePermissions(path, LinkOption.NOFOLLOW_LINKS));
attrs = Files.readAttributes(path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS); attrs = Files.readAttributes(path, PosixFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
if (Files.isSymbolicLink(path)) { if (Files.isSymbolicLink(path)) {
linkType = FileLinkType.SYMLINK; linkType = FileLinkType.SYMLINK;
} else if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) { } else if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
...@@ -785,7 +785,7 @@ public final class Posix ...@@ -785,7 +785,7 @@ public final class Posix
} }
short permissions = getNumericAccessMode(Files.getPosixFilePermissions(path)); short permissions = getNumericAccessMode(Files.getPosixFilePermissions(path));
BasicFileAttributes attrs = Files.readAttributes(path, BasicFileAttributes.class); PosixFileAttributes attrs = Files.readAttributes(path, PosixFileAttributes.class);
FileLinkType linkType; FileLinkType linkType;
if (attrs.isSymbolicLink()) { if (attrs.isSymbolicLink()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment