diff options
| author | Joel Klinghed <the_jk@spawned.biz> | 2024-08-22 22:33:45 +0200 |
|---|---|---|
| committer | Joel Klinghed <the_jk@spawned.biz> | 2024-08-22 22:33:45 +0200 |
| commit | 399a431f1b8610b94cd38f7910ca4c70c29906d5 (patch) | |
| tree | b57ae15057ae7c798a0c5cfddab15bcb2d2f909f | |
| parent | e38036e670d234b36053e03be92dd8f27acb16c0 (diff) | |
fixup! samba: Add docker server run by tests
follow symlinks = no doesn't have intended effect
| -rw-r--r-- | libs/samba/src/test/docker/docker-compose.yml | 2 | ||||
| -rw-r--r-- | libs/samba/src/test/java/org/the_jk/cleversync/samba/SambaTreeTest.kt | 15 |
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() } |