opendev/gerrit
Code Issues Proposed changes

MultiBaseLocalDiskRepositoryManagerTest: fix for running on Mac from Eclipse

Browse Source 
The alternateRepositoryLocation test was failing when running from
Eclipse on Mac because the created repository location would be:

  /private/var/rest/of/path

while the alternateBasePath is:

  /var/rest/of/path

This difference comes from the fact that on Mac the /var is a symlink to
/private/var and the creation of the repository would resolve the
location using getCanonicalFile().

Use alternateBasePath.toRealPath() to resolve any symlinks in the
alternateBasePath.

NOTE: this issue doesn't show up when running tests from bazel as
bazel's sandboxing uses different path locations.

Change-Id: I2cb1adc48e16edc5adffd7b7f8eea2b5ea1a60f3
This commit is contained in:
Saša Živkov
2021-02-02 16:58:31 +01:00
parent 791047f24f
commit c4c258816f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
View File

@@ -93,12 +93,14 @@ public class MultiBaseLocalDiskRepositoryManagerTest {
Repository repo = repoManager.createRepository(someProjectKey); Repository repo = repoManager.createRepository(someProjectKey);
assertThat(repo.getDirectory()).isNotNull(); assertThat(repo.getDirectory()).isNotNull();
assertThat(repo.getDirectory().exists()).isTrue(); assertThat(repo.getDirectory().exists()).isTrue();
assertThat(repo.getDirectory().getParent()).isEqualTo(alternateBasePath.toString()); assertThat(repo.getDirectory().getParent())
.isEqualTo(alternateBasePath.toRealPath().toString());
repo = repoManager.openRepository(someProjectKey); repo = repoManager.openRepository(someProjectKey);
assertThat(repo.getDirectory()).isNotNull(); assertThat(repo.getDirectory()).isNotNull();
assertThat(repo.getDirectory().exists()).isTrue(); assertThat(repo.getDirectory().exists()).isTrue();
assertThat(repo.getDirectory().getParent()).isEqualTo(alternateBasePath.toString()); assertThat(repo.getDirectory().getParent())
.isEqualTo(alternateBasePath.toRealPath().toString());
assertThat(repoManager.getBasePath(someProjectKey).toAbsolutePath().toString()) assertThat(repoManager.getBasePath(someProjectKey).toAbsolutePath().toString())
.isEqualTo(alternateBasePath.toString()); .isEqualTo(alternateBasePath.toString());