summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/samba/src/test/docker/docker-compose.yml2
-rw-r--r--libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt15
2 files changed, 12 insertions, 5 deletions
diff --git a/libs/samba/src/test/docker/docker-compose.yml b/libs/samba/src/test/docker/docker-compose.yml
index 1626b3c..c7af330 100644
--- a/libs/samba/src/test/docker/docker-compose.yml
+++ b/libs/samba/src/test/docker/docker-compose.yml
@@ -13,8 +13,6 @@ services:
UID_test: 1000
GROUPS_test: family
- SAMBA_GLOBAL_STANZA: "follow symlinks = no"
-
SAMBA_VOLUME_CONFIG_test: "[Share]; path=/shares/test; valid users = test; guest ok = no; read only = no; browseable = yes"
volumes:
diff --git a/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt b/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt
index 7e0a208..1eddb6b 100644
--- a/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt
+++ b/libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt
@@ -65,9 +65,18 @@ class SambaTreeTest {
assertThat(content.directories).hasSize(1)
assertThat(content.directories[0].name).isEqualTo("dir")
- assertThat(content.files).hasSize(1)
- assertThat(content.files[0].name).isEqualTo("file")
- assertThat(content.files[0].size).isEqualTo(3UL)
+ assertThat(content.files).hasSize(2)
+ if (content.files[0].name == "file") {
+ assertThat(content.files[0].name).isEqualTo("file")
+ assertThat(content.files[0].size).isEqualTo(3UL)
+ assertThat(content.files[1].name).isEqualTo("link")
+ assertThat(content.files[1].size).isEqualTo(3UL)
+ } else {
+ assertThat(content.files[0].name).isEqualTo("link")
+ assertThat(content.files[0].size).isEqualTo(3UL)
+ assertThat(content.files[1].name).isEqualTo("file")
+ assertThat(content.files[1].size).isEqualTo(3UL)
+ }
// libsmb uses SMB2/SMB3 and unix extensions are SMB1, so no symlinks for now
assertThat(content.links).isEmpty()
}